diff --git a/src/server.c b/src/server.c
index 1632c84..5a8bc7f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -291,8 +291,6 @@ static int sock_delete_remote(patty_ax25_server *server,
 
 static int sock_shutdown(patty_ax25_server *server,
                          patty_ax25_sock *sock) {
-    int ret;
-
     fd_clear(server, sock->fd);
 
     if (sock->type != PATTY_AX25_SOCK_STREAM) {
@@ -303,14 +301,12 @@ static int sock_shutdown(patty_ax25_server *server,
         return 0;
     }
 
-    ret = patty_ax25_sock_send_disc(sock, PATTY_AX25_FRAME_POLL);
-
     sock->state   = PATTY_AX25_SOCK_PENDING_DISCONNECT;
     sock->retries = sock->n_retry;
 
     patty_timer_start(&sock->timer_t1);
 
-    return ret;
+    return patty_ax25_sock_send_disc(sock, PATTY_AX25_FRAME_POLL);
 }
 
 static int sock_save(patty_ax25_server *server,