diff --git a/composite.cpp b/composite.cpp
index 99eb65dd72..ea540a4ce9 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -935,8 +935,7 @@ void Toplevel::damageNotifyEvent(XDamageNotifyEvent* e)
 
 bool Toplevel::compositing() const
 {
-    Compositor *c = Compositor::self();
-    return c && c->hasScene();
+    return Workspace::self()->compositing();
 }
 
 void Client::damageNotifyEvent(XDamageNotifyEvent* e)
diff --git a/composite.h b/composite.h
index 1655ffeedd..04ac4d56cf 100644
--- a/composite.h
+++ b/composite.h
@@ -139,7 +139,6 @@ public:
      * @see createCompositor
      **/
     static Compositor *self() {
-        Q_ASSERT(s_compositor);
         return s_compositor;
     }
     /**
diff --git a/workspace.h b/workspace.h
index 708e23333d..ff37842213 100644
--- a/workspace.h
+++ b/workspace.h
@@ -525,6 +525,11 @@ public:
         return movingClient;
     }
 
+    /**
+     * @returns Whether we have a Compositor and it is active (Scene created)
+     **/
+    bool compositing() const;
+
 public slots:
     // Keybindings
     void slotSwitchDesktopNext();
@@ -745,11 +750,6 @@ private:
     static NET::WindowType txtToWindowType(const char* txt);
     static bool sessionInfoWindowTypeMatch(Client* c, SessionInfo* info);
 
-    /**
-     * @returns Whether we have a Compositor and it is active (Scene created)
-     **/
-    bool compositing() const;
-
     Client* active_client;
     Client* last_active_client;
     Client* most_recently_raised; // Used ONLY by raiseOrLowerClient()