diff --git a/server-client.c b/server-client.c
index 9ced4482e..0f8ba2451 100644
--- a/server-client.c
+++ b/server-client.c
@@ -155,7 +155,8 @@ server_client_clear_overlay(struct client *c)
 	c->overlay_data = NULL;
 
 	c->tty.flags &= ~(TTY_FREEZE|TTY_NOCURSOR);
-	window_update_focus(c->session->curw->window);
+	if (c->session != NULL)
+		window_update_focus(c->session->curw->window);
 	server_redraw_client(c);
 }