diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp
index d43816e55..bd97427cc 100644
--- a/src/blackcore/db/backgrounddataupdater.cpp
+++ b/src/blackcore/db/backgrounddataupdater.cpp
@@ -75,7 +75,7 @@ namespace BlackCore
             m_enabled = false;
             if (!CThreadUtils::isCurrentThreadObjectThread(this))
             {
-                this->abandonAndWait();
+                doIfNotFinished([this] { this->abandonAndWait(); });
             }
         }