diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 3976dee9..66bd8bf1 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -372,6 +372,9 @@ void CCompositor::cleanup() {
     if (!m_sWLDisplay || m_bIsShuttingDown)
         return;
 
+    signal(SIGABRT, SIG_DFL);
+    signal(SIGSEGV, SIG_DFL);
+
     removeLockFile();
 
     m_bIsShuttingDown   = true;