diff --git a/frontend/app/player/web/MessageManager.ts b/frontend/app/player/web/MessageManager.ts
index e548f406e..8f0920eb4 100644
--- a/frontend/app/player/web/MessageManager.ts
+++ b/frontend/app/player/web/MessageManager.ts
@@ -144,10 +144,8 @@ export default class MessageManager {
 
   private parseAndDistributeMessages(fileReader: MFileReader, onMessage?: (msg: Message) => void) {
     const msgs: Array<Message> = []
-    let next: ReturnType<MFileReader['next']>
-    while (next = fileReader.next()) {
-      const [msg, index] = next
-      this.distributeMessage(msg, index)
+    for (let msg = fileReader.readNext();msg !== null;msg = fileReader.readNext()) {
+      this.distributeMessage(msg, msg._index)
       msgs.push(msg)
       onMessage?.(msg)
     }
diff --git a/frontend/app/player/web/messages/MFileReader.ts b/frontend/app/player/web/messages/MFileReader.ts
index 5c8ddbf30..8c753979c 100644
--- a/frontend/app/player/web/messages/MFileReader.ts
+++ b/frontend/app/player/web/messages/MFileReader.ts
@@ -49,7 +49,7 @@ export default class MFileReader extends RawMessageReader {
     }
   }
 
-  next(): [ Message, number] | null {
+  readNext(): Message & { _index: number } | null {
     if (this.error || !this.hasNextByte()) {
       return null
     }
@@ -74,7 +74,7 @@ export default class MFileReader extends RawMessageReader {
         this.startTime = rMsg.timestamp
       }
       this.currentTime = rMsg.timestamp - this.startTime
-      return this.next()
+      return this.readNext()
     }
 
     const index = this.getLastMessageID()
@@ -83,6 +83,6 @@ export default class MFileReader extends RawMessageReader {
       _index: index,
     })
 
-    return [msg, index]
+    return msg
   }
 }