diff --git a/composite.cpp b/composite.cpp
index 6a2efdc1c4..99eb65dd72 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -136,6 +136,7 @@ Compositor::~Compositor()
 {
     finish();
     delete cm_selection;
+    s_compositor = NULL;
 }