diff --git a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
index a4ebd0fa..452bba25 100644
--- a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
@@ -94,6 +94,10 @@ public:
       std::unique_lock refreshLock(refreshMutex_);
       std::unique_lock timerLock(timerMutex_);
       refreshTimer_.cancel();
+      timerLock.unlock();
+      refreshLock.unlock();
+
+      threadPool_.join();
    }
 
    bool                 refresh_enabled() const;