diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index a508c6124..fdf3f9847 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4359,8 +4359,10 @@ desktop_shell_client_destroy(struct wl_listener *listener, void *data)
 	 * returning.
 	 */
 
-	if (!check_desktop_shell_crash_too_early(shell))
+	if (!shell->compositor->shutting_down &&
+	    !check_desktop_shell_crash_too_early(shell)) {
 		respawn_desktop_shell_process(shell);
+	}
 
 	shell_fade_startup(shell);
 }