diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index c5f54f04..8a0da27b 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2795,6 +2795,6 @@ void CCompositor::updateSuspendedStates() {
         if (!w->m_bIsMapped)
             continue;
 
-        w->setSuspended(w->isHidden() || !g_pHyprRenderer->shouldRenderWindow(w.get()));
+        w->setSuspended(w->isHidden() || !isWorkspaceVisible(w->m_iWorkspaceID));
     }
 }
diff --git a/src/Window.cpp b/src/Window.cpp
index 75a1dc2a..debacde0 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -1036,4 +1036,5 @@ void CWindow::setSuspended(bool suspend) {
         return;
 
     wlr_xdg_toplevel_set_suspended(m_uSurface.xdg->toplevel, suspend);
+    m_bSuspended = suspend;
 }