diff --git a/repertory/librepertory/include/events/t_event_system.hpp b/repertory/librepertory/include/events/t_event_system.hpp
index 2539e766..6770ce5c 100644
--- a/repertory/librepertory/include/events/t_event_system.hpp
+++ b/repertory/librepertory/include/events/t_event_system.hpp
@@ -95,7 +95,7 @@ private:
     std::vector<std::shared_ptr<event_type>> events;
 
     unique_mutex_lock lock(event_mutex_);
-    while (not get_stop_requested() && event_list_.empty()) {
+    if (not get_stop_requested() && event_list_.empty()) {
       event_notify_.wait_for(lock, 4s);
     }