diff --git a/libs/scheduler-kafka/tests/drain.py b/libs/scheduler-kafka/tests/drain.py
index 3fefe07cd..84a3463c2 100644
--- a/libs/scheduler-kafka/tests/drain.py
+++ b/libs/scheduler-kafka/tests/drain.py
@@ -32,7 +32,9 @@ async def drain_topics_async(
     def done() -> bool:
         return (
             len(orch_msgs) > 0
+            and any(orch_msgs)
             and len(exec_msgs) > 0
+            and any(exec_msgs)
             and not orch_msgs[-1]
             and not exec_msgs[-1]
         )
@@ -97,7 +99,9 @@ def drain_topics(
     def done() -> bool:
         return (
             len(orch_msgs) > 0
+            and any(orch_msgs)
             and len(exec_msgs) > 0
+            and any(exec_msgs)
             and not orch_msgs[-1]
             and not exec_msgs[-1]
         )