diff --git a/src/musikcore/audio/Crossfader.cpp b/src/musikcore/audio/Crossfader.cpp
index 46d707775..7c1e74d91 100644
--- a/src/musikcore/audio/Crossfader.cpp
+++ b/src/musikcore/audio/Crossfader.cpp
@@ -73,10 +73,10 @@ Crossfader::Crossfader(ITransport& transport)
 }
 
 Crossfader::~Crossfader() {
-    this->messageQueue.Unregister(this);
     this->quit = true;
     this->messageQueue.Post(Message::Create(this, MESSAGE_QUIT, 0, 0));
     this->thread->join();
+    this->messageQueue.Unregister(this);
 }
 
 void Crossfader::Fade(