diff --git a/eos/kafka_serializer.py b/eos/kafka_serializer.py
index 85c4ec2..c0ad71b 100644
--- a/eos/kafka_serializer.py
+++ b/eos/kafka_serializer.py
@@ -160,7 +160,7 @@ class ESSSerializer:
                     )
             self.producer.flush()
             if isinstance(command, Stop):
-                if command.hist_id == self._active_histogram_yz:
+                if command.hist_id in [self._active_histogram_yz, self._active_histogram_tofz]:
                     self.count_stopped.set()
                 else:
                     return