diff --git a/socket-handler.c b/socket-handler.c
index efcd5b8..c036b58 100644
--- a/socket-handler.c
+++ b/socket-handler.c
@@ -259,6 +259,7 @@
 
 	rc = client_drain_queue(client, 0);
 	if (rc) {
+		client->poller = NULL;
 		client_close(client);
 		return POLLER_REMOVE;
 	}