diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 317f4fb75..ebcd9642e 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -478,6 +478,10 @@ static void
 destroy_surface_extension (struct wl_resource *resource)
 {
   MetaWaylandSurfaceExtension *extension = wl_resource_get_user_data (resource);
+
+  if (extension->resource == NULL)
+    return;
+
   wl_list_remove (&extension->surface_destroy_listener.link);
   extension->surface_destroy_listener.notify = NULL;
   extension->resource = NULL;