diff --git a/types/wlr_layer_shell.c b/types/wlr_layer_shell.c
index c61556bf..61ab5c14 100644
--- a/types/wlr_layer_shell.c
+++ b/types/wlr_layer_shell.c
@@ -287,7 +287,9 @@ static void handle_wlr_surface_committed(struct wlr_surface *wlr_surface,
 		surface->added = true;
 		wlr_signal_emit_safe(&surface->shell->events.new_surface,
 				surface);
-		assert(surface->output);
+		// either the compositor found a suitable output or it must
+		// have closed the surface
+		assert(surface->output || surface->closed);
 	}
 	if (surface->configured && wlr_surface_has_buffer(surface->surface) &&
 			!surface->mapped) {