diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
index c3d0f4854..1fd7a0752 100644
--- a/src/wayland/meta-window-wayland.c
+++ b/src/wayland/meta-window-wayland.c
@@ -1184,14 +1184,7 @@ meta_window_wayland_finish_move_resize (MetaWindow              *window,
    * scale new_geom to physical pixels given what buffer scale and texture scale
    * is in use. */
 
-  acked_configuration = acquire_acked_configuration (wl_window, pending,
-                                                     &is_client_resize);
-
-  if (acked_configuration)
-    geometry_scale = acked_configuration->scale;
-  else
-    geometry_scale = meta_window_wayland_get_geometry_scale (window);
-
+  geometry_scale = meta_window_wayland_get_geometry_scale (window);
   new_geom.x *= geometry_scale;
   new_geom.y *= geometry_scale;
   new_geom.width *= geometry_scale;
@@ -1221,6 +1214,9 @@ meta_window_wayland_finish_move_resize (MetaWindow              *window,
 
   flags = META_MOVE_RESIZE_WAYLAND_FINISH_MOVE_RESIZE;
 
+  acked_configuration = acquire_acked_configuration (wl_window, pending,
+                                                     &is_client_resize);
+
   window_drag = meta_compositor_get_current_window_drag (display->compositor);
 
   /* x/y are ignored when we're doing interactive resizing */