diff --git a/src/Console/Command/WatchCommand.php b/src/Console/Command/WatchCommand.php
index 3f323af5e..142b6cb04 100644
--- a/src/Console/Command/WatchCommand.php
+++ b/src/Console/Command/WatchCommand.php
@@ -75,10 +75,9 @@ function () use ($console, &$index, $aggregate, $aggregateId): void {
 
                 foreach ($stream as $message) {
                     $console->message($this->serializer, $message);
+                    $index = $stream->index();
                 }
 
-                $index = $stream->index();
-
                 $stream->close();
             },
             [],