diff --git a/geometry.cpp b/geometry.cpp
index f36744cff8..976882a4b5 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2142,9 +2142,6 @@ void AbstractClient::blockGeometryUpdates(bool block)
 
 void AbstractClient::maximize(MaximizeMode m)
 {
-    if (m == maximizeMode()) {
-        return;
-    }
     setMaximize(m & MaximizeVertical, m & MaximizeHorizontal);
 }
 
diff --git a/shell_client.cpp b/shell_client.cpp
index d6d22059e5..e314f16160 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -839,6 +839,10 @@ void ShellClient::changeMaximize(bool horizontal, bool vertical, bool adjust)
     }
     // TODO: add more checks as in Client
 
+    if (m_requestedMaximizeMode == oldMode) {
+        return;
+    }
+
     // call into decoration update borders
     if (isDecorated() && decoration()->client() && !(options->borderlessMaximizedWindows() && m_requestedMaximizeMode == KWin::MaximizeFull)) {
         changeMaximizeRecursion = true;