diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 5d76054b..da7cd878 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2182,7 +2182,7 @@ void CCompositor::moveWorkspaceToMonitor(CWorkspace* pWorkspace, CMonitor* pMoni
 
     // fix old mon
     int nextWorkspaceOnMonitorID = -1;
-    if (!SWITCHINGISACTIVE)
+    if (!SWITCHINGISACTIVE || !POLDMON)
         nextWorkspaceOnMonitorID = pWorkspace->m_iID;
     else {
         for (auto& w : m_vWorkspaces) {