diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 5c42b8ff..fee98f8e 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -419,12 +419,10 @@ void CCompositor::cleanup() {
         g_pXWaylandManager->m_sWLRXWayland = nullptr;
     }
 
+    wl_display_destroy_clients(g_pCompositor->m_sWLDisplay);
     removeAllSignals();
 
     g_pInputManager.reset();
-
-    wl_display_destroy_clients(g_pCompositor->m_sWLDisplay);
-
     g_pDecorationPositioner.reset();
     g_pCursorManager.reset();
     g_pPluginSystem.reset();