diff --git a/src/compositor/meta-window-content.c b/src/compositor/meta-window-content.c
index 5632a84a1..f2abd2e26 100644
--- a/src/compositor/meta-window-content.c
+++ b/src/compositor/meta-window-content.c
@@ -293,7 +293,7 @@ meta_window_content_dispose (GObject *object)
 {
   MetaWindowContent *window_content = META_WINDOW_CONTENT (object);
 
-  set_surface_invalidate_func (window_content, surface_actor, NULL);
+  set_surface_invalidate_func (window_content, NULL);
 
   G_OBJECT_CLASS (meta_window_content_parent_class)->dispose (object);
 }
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index e10467502..02c888d48 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -726,6 +726,7 @@ meta_wayland_surface_apply_pending_state (MetaWaylandSurface      *surface,
               meta_shaped_texture_set_texture (stex, texture);
               meta_shaped_texture_set_snippet (stex, snippet);
               meta_shaped_texture_set_is_y_inverted (stex, is_y_inverted);
+              clutter_content_invalidate (CLUTTER_CONTENT (stex));
               g_clear_pointer (&snippet, cogl_object_unref);
             }
         }