diff --git a/composite.cpp b/composite.cpp
index 7881c8c2e7..1438ce68de 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -463,6 +463,8 @@ void Workspace::checkUnredirect( bool force )
 
 void Workspace::delayedCheckUnredirect()
     {
+    if( !compositing() || overlay == None || !options->unredirectFullscreen )
+        return;
     ToplevelList list;
     bool changed = forceUnredirectCheck;
     foreach( Client* c, clients )