diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 44f6c41b5..33b3b8db7 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -44,11 +44,11 @@ xserver_set_window_id (struct wl_client *client,
   MetaWindow *window;
 
   window = meta_display_lookup_x_window (display, xid);
-  if (window)
-    {
-      surface->window = window;
-      window->surface = surface;
-    }
+  if (!window)
+    return;
+
+  surface->window = window;
+  window->surface = surface;
 }
 
 static const struct xserver_interface xserver_implementation = {