diff --git a/window.c b/window.c
index 2429d7b7..16f1ecb3 100644
--- a/window.c
+++ b/window.c
@@ -1922,6 +1922,8 @@ window_pane_get_theme(struct window_pane *wp)
 void
 window_pane_send_theme_update(struct window_pane *wp)
 {
+	if (wp == NULL || window_pane_exited(wp))
+		return;
 	if (~wp->flags & PANE_THEMECHANGED)
 		return;
 	if (~wp->screen->mode & MODE_THEME_UPDATES)