diff --git a/shell_client.cpp b/shell_client.cpp
index 919fb75eb8..2f6216dedf 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -603,7 +603,9 @@ void ShellClient::updateDecoration(bool check_workspace_pos, bool force)
     if (m_xdgDecoration) {
         auto mode = isDecorated() || m_userNoBorder ? XdgDecorationInterface::Mode::ServerSide: XdgDecorationInterface::Mode::ClientSide;
         m_xdgDecoration->configure(mode);
-        m_xdgShellSurface->configure(xdgSurfaceStates(), m_requestedClientSize);
+        if (m_requestGeometryBlockCounter == 0) {
+            m_xdgShellSurface->configure(xdgSurfaceStates(), m_requestedClientSize);
+        }
     }
     getShadow();
     if (check_workspace_pos)