diff --git a/src/core/library/LocalLibrary.cpp b/src/core/library/LocalLibrary.cpp
index fdef5633c..b9b5405ca 100644
--- a/src/core/library/LocalLibrary.cpp
+++ b/src/core/library/LocalLibrary.cpp
@@ -199,13 +199,12 @@ void LocalLibrary::ThreadProc() {
     LocalQueryPtr query;
 
     while (true) {
-        std::unique_lock<std::mutex> lock(this->mutex);
-
         if ((query = GetNextQuery())) {
             this->RunQuery(query);
         }
 
         if (!this->queryQueue.size() && !this->Exited()) {
+            std::unique_lock<std::mutex> lock(this->mutex);
             this->queueCondition.wait(lock);
         }