diff --git a/src/server.c b/src/server.c
index c797f3c..f636f75 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1275,7 +1275,8 @@ static int frame_ack(patty_ax25_server *server,
         }
 
         if (frame->nr >= min && frame->nr <= max) {
-            sock->vs = frame->nr;
+            sock->vs      = frame->nr;
+            sock->retries = sock->n_retry;
 
             patty_timer_start(&sock->timer_t1);
         }
@@ -2192,8 +2193,6 @@ static int handle_sock(uint32_t key,
     if ((len = patty_ax25_sock_resend_pending(sock)) < 0) {
         goto error_sock_resend_pending;
     } else if (len > 0) {
-        sock->retries = sock->n_retry;
-
         patty_timer_start(&sock->timer_t1);
 
         return 0;
@@ -2212,8 +2211,6 @@ static int handle_sock(uint32_t key,
             goto error_sock_write;
         }
 
-        sock->retries = sock->n_retry;
-
         patty_timer_start(&sock->timer_t1);
     }