diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 1032c4a78..780c62e02 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -969,9 +969,7 @@ cleanup:
 void
 meta_wayland_surface_apply_cached_state (MetaWaylandSurface *surface)
 {
-  if (!surface->cached_state)
-    return;
-
+  meta_wayland_surface_ensure_cached_state (surface);
   meta_wayland_surface_apply_state (surface, surface->cached_state);
 }