diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h
index a76b8b0b5c..d0b3631a9d 100644
--- a/src/server/shared/Threading/ProducerConsumerQueue.h
+++ b/src/server/shared/Threading/ProducerConsumerQueue.h
@@ -82,7 +82,7 @@ public:
 
     void Cancel()
     {
-        _queueLock.lock();
+        std::unique_lock<std::mutex> lock(_queueLock);
 
         while (!_queue.empty())
         {
@@ -95,8 +95,6 @@ public:
 
         _shutdown = true;
 
-        _queueLock.unlock();
-
         _condition.notify_all();
     }