diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 150a4df8b2..268db49d99 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -1235,7 +1235,8 @@ surface_leave (void              *data,
 
   impl->display_server.outputs = g_slist_remove (impl->display_server.outputs, output);
 
-  window_update_scale (window);
+  if (impl->display_server.outputs)
+    window_update_scale (window);
 }
 
 static const struct wl_surface_listener surface_listener = {