diff --git a/src/platform/qt/CoreController.cpp b/src/platform/qt/CoreController.cpp
index a6d60b99c..6f12fa891 100644
--- a/src/platform/qt/CoreController.cpp
+++ b/src/platform/qt/CoreController.cpp
@@ -204,13 +204,13 @@ CoreController::~CoreController() {
 	stop();
 	disconnect();
 
+	mCoreThreadJoin(&m_threadContext);
+
 	if (m_cacheSet) {
 		mCacheSetDeinit(m_cacheSet.get());
 		m_cacheSet.reset();
 	}
 
-	mCoreThreadJoin(&m_threadContext);
-
 	mCoreConfigDeinit(&m_threadContext.core->config);
 	m_threadContext.core->deinit(m_threadContext.core);
 }