diff --git a/gdk/wayland/gdkseat-wayland.c b/gdk/wayland/gdkseat-wayland.c
index 7ce5ddfb01fd1600b053c789dd5f0baa13ad293b..a799ac7369ffbcc69d09be2ea78c121bc6ef51e5 100644
--- a/gdk/wayland/gdkseat-wayland.c
+++ b/gdk/wayland/gdkseat-wayland.c
@@ -346,6 +346,9 @@ data_device_enter (void                  *data,
   GdkContentFormats *formats;
   GdkDevice *device;
 
+  if (!surface)
+    return;
+
   dest_surface = wl_surface_get_user_data (surface);
 
   if (!GDK_IS_SURFACE (dest_surface))