diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 33fda6d0..187be799 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4732,6 +4732,9 @@ shell_reposition_view_on_output_destroy(struct weston_view *view)
 	float x, y;
 	int visible;
 
+	if (wl_list_empty(&ec->output_list))
+		return;
+
 	x = view->geometry.x;
 	y = view->geometry.y;