diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index e39f7786..e8ad51c4 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -176,7 +176,7 @@ UBFeaturesComputingThread::~UBFeaturesComputingThread()
     mWaitCondition.wakeOne();
     mMutex.unlock();
 
-    quit();
+    wait();
 }
 
 UBFeature::UBFeature(const QString &url, const QImage &icon, const QString &name, const QUrl &realPath, UBFeatureElementType type)