diff --git a/kwin/composite.cpp b/kwin/composite.cpp
index adb0d882..6c36e98e 100644
--- a/kwin/composite.cpp
+++ b/kwin/composite.cpp
@@ -127,7 +127,10 @@ Compositor::~Compositor()
 {
     finish();
     deleteUnusedSupportProperties();
-    delete cm_selection;
+    if (cm_selection) {
+        disconnect(cm_selection, 0, this, 0);
+        delete cm_selection;
+    }
     s_compositor = NULL;
 }