diff --git a/src/backend/wayland/wl_backend.c b/src/backend/wayland/wl_backend.c
index 854e838..89f9b3e 100644
--- a/src/backend/wayland/wl_backend.c
+++ b/src/backend/wayland/wl_backend.c
@@ -1914,17 +1914,8 @@ handle_xwayland_new_surface(struct wl_listener *listener, void *data)
      * management — apps that misbehave this way simply won't be managed,
      * which is better than a broken-pipe crash. */
     if (!xw->class && !xw->title) {
-        wwarning("wl_backend: xwayland classless surface 0x%x skipped (internal window)",
+        wwarning("wl_backend: xwayland surface 0x%x has no class/title yet — deferring",
                  (unsigned)xw->window_id);
-        /* Mark as override_redirect so XWM stops trying to composite it. */
-        if (wl_state.x_display) {
-            XSetWindowAttributes or_attr;
-            or_attr.override_redirect = True;
-            XChangeWindowAttributes(wl_state.x_display, (WNativeWindow)xw->window_id,
-                                    CWOverrideRedirect, &or_attr);
-            XFlush(wl_state.x_display);
-        }
-        return;
     }
 
     struct wl_toplevel_view *view = wmalloc(sizeof(*view));