diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index f7cdb0171..7e5e8eb71 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1745,6 +1745,9 @@ meta_wayland_surface_role_get_window (MetaWaylandSurfaceRole *surface_role)
 MetaWindow *
 meta_wayland_surface_get_window (MetaWaylandSurface *surface)
 {
+  if (!surface->role)
+    return NULL;
+
   return meta_wayland_surface_role_get_window (surface->role);
 }