diff --git a/repertory/librepertory/src/comm/packet/client_pool.cpp b/repertory/librepertory/src/comm/packet/client_pool.cpp
index 8806fd74..8da051c9 100644
--- a/repertory/librepertory/src/comm/packet/client_pool.cpp
+++ b/repertory/librepertory/src/comm/packet/client_pool.cpp
@@ -75,8 +75,10 @@ void client_pool::pool::work_queue::work_thread() {
   while (not shutdown) {
     lock.lock();
     if (actions.empty()) {
-      notify.wait_for(lock, std::chrono::seconds(5U));
-      unlock_and_notify();
+      if (not shutdown) {
+        notify.wait_for(lock, std::chrono::seconds(5U));
+        unlock_and_notify();
+      }
       continue;
     }