diff --git a/server-client.c b/server-client.c
index 3c096e12..6d00dd37 100644
--- a/server-client.c
+++ b/server-client.c
@@ -199,9 +199,10 @@ server_client_loop(void)
 			continue;
 
 		server_client_handle_data(c);
-
-		server_client_check_timers(c);
-		server_client_check_redraw(c);
+		if (c->session != NULL) {
+			server_client_check_timers(c);
+			server_client_check_redraw(c);
+		}
 	}
 
 	/*