diff --git a/lualib-src/lua-socket.c b/lualib-src/lua-socket.c
index 8f5a4a18..a2572bf9 100644
--- a/lualib-src/lua-socket.c
+++ b/lualib-src/lua-socket.c
@@ -133,6 +133,7 @@ lpushbuffer(lua_State *L) {
 static void
 return_free_node(lua_State *L, int pool, struct socket_buffer *sb) {
 	struct buffer_node *free_node = sb->head;
+	sb->offset = 0;
 	sb->head = free_node->next;
 	if (sb->head == NULL) {
 		sb->tail = NULL;
@@ -158,7 +159,6 @@ pop_lstring(lua_State *L, struct socket_buffer *sb, int sz, int skip) {
 	}
 	if (sz == current->sz - sb->offset) {
 		lua_pushlstring(L, current->msg + sb->offset, sz-skip);
-		sb->offset = 0;
 		return_free_node(L,2,sb);
 		return;
 	}
@@ -174,13 +174,11 @@ pop_lstring(lua_State *L, struct socket_buffer *sb, int sz, int skip) {
 			sb->offset += sz;
 			if (bytes == sz) {
 				return_free_node(L,2,sb);
-				sb->offset = 0;
 			}
 			break;
 		}
 		luaL_addlstring(&b, current->msg + sb->offset, (sz - skip < bytes) ? sz - skip : bytes);
 		return_free_node(L,2,sb);
-		sb->offset = 0;
 		sz-=bytes;
 		if (sz==0)
 			break;