diff --git a/server.c b/server.c
index 88dd0822..176cafcb 100644
--- a/server.c
+++ b/server.c
@@ -194,8 +194,10 @@ server_loop(void)
 
 	do {
 		items = cmdq_next(NULL);
-		TAILQ_FOREACH(c, &clients, entry)
-		    items += cmdq_next(c);
+		TAILQ_FOREACH(c, &clients, entry) {
+			if (c->flags & CLIENT_IDENTIFIED)
+				items += cmdq_next(c);
+		}
 	} while (items != 0);
 
 	server_client_loop();