diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 0e0d622bd..d6c798647 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -16030,7 +16030,8 @@ clutter_actor_finish_layout (ClutterActor *self,
   ClutterActorPrivate *priv = self->priv;
   ClutterActor *child;
 
-  if (!CLUTTER_ACTOR_IS_MAPPED (self) ||
+  if ((!CLUTTER_ACTOR_IS_MAPPED (self) &&
+       !clutter_actor_has_mapped_clones (self)) ||
       CLUTTER_ACTOR_IN_DESTRUCTION (self))
     return;