diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 20656243..1163acca 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2170,7 +2170,7 @@ void CCompositor::updateFullscreenFadeOnWorkspace(CWorkspace* pWorkspace) {
 }
 
 void CCompositor::setWindowFullscreen(CWindow* pWindow, bool on, eFullscreenMode mode) {
-    if (!windowValidMapped(pWindow))
+    if (!windowValidMapped(pWindow) || g_pCompositor->m_bUnsafeState)
         return;
 
     if (pWindow->m_bPinned) {