diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 3a4d7cc47..30c63c423 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -2113,6 +2113,9 @@ check_needs_reshape (MetaWindowActor *self)
   cairo_rectangle_int_t client_area;
   gboolean needs_mask;
 
+  if (!priv->mapped)
+    return;
+
   if (!priv->needs_reshape)
     return;