diff --git a/gdk/gdksubsurface.c b/gdk/gdksubsurface.c
index 2f8386946a..2ce21030ac 100644
--- a/gdk/gdksubsurface.c
+++ b/gdk/gdksubsurface.c
@@ -29,11 +29,14 @@ gdk_subsurface_init (GdkSubsurface *self)
 {
 }
 
+static void remove_subsurface (GdkSubsurface *subsurface);
+
 static void
 gdk_subsurface_finalize (GObject *object)
 {
   GdkSubsurface *subsurface = GDK_SUBSURFACE (object);
 
+  remove_subsurface (subsurface);
   g_ptr_array_remove (subsurface->parent->subsurfaces, subsurface);
   g_clear_object (&subsurface->parent);