diff --git a/socket-handler.c b/socket-handler.c
index af43989..a0b3028 100644
--- a/socket-handler.c
+++ b/socket-handler.c
@@ -355,10 +355,9 @@
 static void socket_fini(struct handler *handler)
 {
 	struct socket_handler *sh = to_socket_handler(handler);
-	int i;
 
-	for (i = 0; i < sh->n_clients; i++)
-		client_close(sh, sh->clients[i]);
+	while (sh->n_clients)
+		client_close(sh, sh->clients[0]);
 
 	if (sh->poller)
 		console_unregister_poller(sh->console, sh->poller);