diff --git a/src/server.c b/src/server.c
index c5e17f0c..32d6d472 100644
--- a/src/server.c
+++ b/src/server.c
@@ -403,8 +403,8 @@ static void server_resolve_cb(EV_P_ ev_timer *watcher, int revents) {
             memcpy(remote->buf, server->buf, server->buf_len);
             remote->buf_len = server->buf_len;
             remote->buf_idx = 0;
-            server->buf_idx = 0;
             server->buf_len = 0;
+            server->buf_idx = 0;
         }
 
         // listen to remote connected event