diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 10df90dbb..4745d96ac 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -343,7 +343,7 @@ meta_window_actor_sync_surface_actor (MetaWindowActor *self)
     {
       if (window->surface)
         surface = window->surface->surface_actor;
-      else
+      else if (!meta_is_wayland_compositor ())
         surface = meta_surface_actor_x11_new (window);
     }