diff --git a/types/wlr_subcompositor.c b/types/wlr_subcompositor.c
index f78f7a45..c66d6f1d 100644
--- a/types/wlr_subcompositor.c
+++ b/types/wlr_subcompositor.c
@@ -195,7 +195,8 @@ static const struct wl_subsurface_interface subsurface_implementation = {
 const struct wlr_surface_role subsurface_role;
 
 void subsurface_consider_map(struct wlr_subsurface *subsurface) {
-	if (subsurface->parent->mapped && wlr_surface_has_buffer(subsurface->surface)) {
+	if (subsurface->added && subsurface->parent->mapped &&
+			wlr_surface_has_buffer(subsurface->surface)) {
 		wlr_surface_map(subsurface->surface);
 	}
 }