diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 1b85f29825..ac91d2887f 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -99,7 +99,8 @@ gdk_broadway_surface_finalize (GObject *object)
 static gboolean
 thaw_updates_cb (GdkSurface *surface)
 {
-  gdk_surface_thaw_updates (surface);
+  if (!GDK_SURFACE_DESTROYED (surface))
+    gdk_surface_thaw_updates (surface);
   g_object_unref (surface);
   return G_SOURCE_REMOVE;
 }