diff --git a/include/ocpp/common/safe_queue.hpp b/include/ocpp/common/safe_queue.hpp
index 21287617a..15f487333 100644
--- a/include/ocpp/common/safe_queue.hpp
+++ b/include/ocpp/common/safe_queue.hpp
@@ -10,9 +10,13 @@
 namespace ocpp {
 
 enum class EThreadNotifyPolicy {
+    // Never notify the waiting thread
     ThreadNotify_Never,
+    // Notify the waiting thread when we push an element in the queue
     ThreadNotify_Push,
+    // Notify the waiting thread when we pop an element from the queue
     ThreadNotify_Pop,
+    // Always notify a waiting thread on all operations
     ThreadNotify_Always,
 };
 
@@ -91,9 +95,11 @@ template <typename T, EThreadNotifyPolicy Policy = EThreadNotifyPolicy::ThreadNo
             empty.swap(queue);
         }
 
-        // Clear should make all waiting threads
-        // wake to check for other states
-        notify_waiting_thread();
+        if constexpr (Policy != EThreadNotifyPolicy::ThreadNotify_Never) {
+            // Clear should make all waiting threads
+            // wake to check for other states
+            notify_waiting_thread();
+        }
     }
 
     /// \brief Waits for the queue to receive an element