diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 04202a02..0c3e480f 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -341,8 +341,12 @@ void CCompositor::cleanup() {
         g_pXWaylandManager->m_sWLRXWayland = nullptr;
     }
 
+    wl_display_destroy_clients(g_pCompositor->m_sWLDisplay);
+
     wl_display_terminate(m_sWLDisplay);
 
+    m_sWLDisplay = nullptr;
+
     g_pKeybindManager->spawn("sleep 5 && kill -9 " + std::to_string(m_iHyprlandPID)); // this is to prevent that random "freezing"
                                                                                       // the PID should not be reused.
 }
diff --git a/src/main.cpp b/src/main.cpp
index 2f2674f2..50a69937 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,13 +73,15 @@ int main(int argc, char** argv) {
         sd_notify(0, "STOPPING=1");
 #endif
 
-    wl_display_destroy_clients(g_pCompositor->m_sWLDisplay);
+    if (g_pCompositor->m_sWLDisplay)
+        wl_display_destroy_clients(g_pCompositor->m_sWLDisplay);
 
     // kill all clients
     for (auto& c : g_pCompositor->m_dProcessPIDsOnShutdown)
         kill(c, SIGKILL);
 
-    wl_display_destroy(g_pCompositor->m_sWLDisplay);
+    if (g_pCompositor->m_sWLDisplay)
+        wl_display_destroy(g_pCompositor->m_sWLDisplay);
 
     return EXIT_SUCCESS;
 }