diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 2c881765..7deba555 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -688,6 +688,9 @@ shell_configuration(struct desktop_shell *shell)
 struct weston_output *
 get_default_output(struct weston_compositor *compositor)
 {
+	if (wl_list_empty(&compositor->output_list))
+		return NULL;
+
 	return container_of(compositor->output_list.next,
 			    struct weston_output, link);
 }