diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index 135ad57325b..32f08d39973 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -413,8 +413,10 @@ static void manageTickEvent(color_ostream& out) {
     if ( toRequeue.empty() )
         return;
     for (auto pair : handlers[EventType::TICK]) {
-        EventHandler &handler = pair.second;
-        enqueueTickEvent(handler);
+        if (toRequeue.count(pair.second)) {
+            EventHandler &handler = pair.second;
+            enqueueTickEvent(handler);
+        }
     }
 }