diff --git a/src/control_socket.cpp b/src/control_socket.cpp
index 06b7d3367..05f603863 100644
--- a/src/control_socket.cpp
+++ b/src/control_socket.cpp
@@ -649,8 +649,10 @@ static void * control_thread(void *args)
                                                 CLOSESOCKET(cur->fd);
                                                 if(cur->prev) {
                                                         cur->prev->next = cur->next;
+                                                        cur->next->prev = cur->prev;
                                                 } else {
                                                         clients = cur->next;
+                                                        clients->prev = NULL;
                                                 }
                                                 next = cur->next;
                                                 free(cur);