diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index cdb8af3d3..ba3726f7c 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -537,7 +537,7 @@ meta_wayland_surface_resource_destroy_cb (struct wl_resource *resource)
 
 	  meta_window_unmanage (surface->window, timestamp);
 	}
-      else
+      else if (!surface->window)
 	meta_wayland_surface_free (surface);
     }
 }