diff --git a/frontend/app/player/web/MessageManager.ts b/frontend/app/player/web/MessageManager.ts
index f59fae3c6..ce128c899 100644
--- a/frontend/app/player/web/MessageManager.ts
+++ b/frontend/app/player/web/MessageManager.ts
@@ -217,16 +217,16 @@ export default class MessageManager {
   async loadMessages(isClickmap: boolean = false) {
     this.state.update({ messagesProcessed: false })
     this.setMessagesLoading(true)
-    const noIndexes = this.session.trackerVersion !== '7.0.0'
     // TODO: reusable decryptor instance
     const createNewParser = (shouldDecrypt = true, file?: string) => {
       const decrypt = shouldDecrypt && this.session.fileKey
         ? (b: Uint8Array) => decryptSessionBytes(b, this.session.fileKey)
         : (b: Uint8Array) => Promise.resolve(b)
       // Each time called - new fileReader created
-      const fileReader = new MFileReader(new Uint8Array(), this.sessionStart, noIndexes)
+      const fileReader = new MFileReader(new Uint8Array(), this.sessionStart)
       return (b: Uint8Array) => decrypt(b).then(b => {
         fileReader.append(b)
+        fileReader.checkForIndexes()
         const msgs: Array<Message> = []
         for (let msg = fileReader.readNext();msg !== null;msg = fileReader.readNext()) {
           msgs.push(msg)
diff --git a/frontend/app/player/web/messages/MFileReader.ts b/frontend/app/player/web/messages/MFileReader.ts
index b0e07a9d7..0295655b6 100644
--- a/frontend/app/player/web/messages/MFileReader.ts
+++ b/frontend/app/player/web/messages/MFileReader.ts
@@ -12,10 +12,22 @@ export default class MFileReader extends RawMessageReader {
   private pLastMessageID: number = 0
   private currentTime: number
   public error: boolean = false
-  constructor(data: Uint8Array, private startTime?: number, private noIndexes?: boolean, private logger= console) {
+  private noIndexes: boolean = false
+  constructor(data: Uint8Array, private startTime?: number, private logger= console) {
     super(data)
   }
 
+  public checkForIndexes() {
+    const firstBytes = this.readCustomIndex(this.buf.slice(0, 9))
+    console.log(firstBytes, this.buf)
+    const skipIndexes = firstBytes === 72057594037927940
+    if (skipIndexes) {
+      this.noIndexes = true
+      this.skip(8)
+      console.log('triggered')
+    }
+  }
+
   private needSkipMessage(): boolean {
     if (this.p === 0) return false
     for (let i = 7; i >= 0; i--) {
@@ -35,7 +47,7 @@ export default class MFileReader extends RawMessageReader {
   }
 
   private readRawMessage(): RawMessage | null {
-    // this.skip(8)
+    if (!this.noIndexes) this.skip(8)
     try {
       return super.readMessage()
     } catch (e) {
@@ -72,6 +84,7 @@ export default class MFileReader extends RawMessageReader {
       return this.readNext()
     }
 
+    console.log(this.noIndexes)
     const index = this.noIndexes ? 0 : this.getLastMessageID()
     const msg = Object.assign(rewriteMessage(rMsg), {
       time: this.currentTime,
diff --git a/frontend/app/player/web/messages/PrimitiveReader.ts b/frontend/app/player/web/messages/PrimitiveReader.ts
index ffb2c3edc..a34d60dc7 100644
--- a/frontend/app/player/web/messages/PrimitiveReader.ts
+++ b/frontend/app/player/web/messages/PrimitiveReader.ts
@@ -28,6 +28,19 @@ export default class PrimitiveReader {
     return r;
   }
 
+  readCustomIndex(input: Uint8Array) {
+    let p = 0, r = 0, s = 1, b
+    do {
+      if (p > 8) {
+        return null
+      }
+      b = input[ p++ ]
+      r += (b & 0x7F) * s
+      s *= 128;
+    } while (b >= 0x80)
+    return r;
+  }
+
   readInt(): number | null {
     let u = this.readUint();
     if (u === null) { return u }