diff --git a/src/phases/message-phase.ts b/src/phases/message-phase.ts
index f6777579857..b277d67de82 100644
--- a/src/phases/message-phase.ts
+++ b/src/phases/message-phase.ts
@@ -35,20 +35,22 @@ export class MessagePhase extends Phase {
         this.text = this.text.split(pokename[p]).join(repname[p]);
       }
       const pageIndex = this.text.indexOf("$");
-      for (let p = 0; p < globalScene.getPlayerField().length; p++) {
-        this.text = this.text.split(repname[p]).join(pokename[p]);
-      }
       if (pageIndex !== -1) {
+        let page0 = this.text.slice(0, pageIndex);
+        let page1 = this.text.slice(pageIndex + 1);
+        // Pokemon names must be re-inserted _after_ the split, otherwise the index will be wrong
+        for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+          page0 = page0.split(repname[p]).join(pokename[p]);
+          page1 = page1.split(repname[p]).join(pokename[p]);
+        }
         globalScene.unshiftPhase(
-          new MessagePhase(
-            this.text.slice(pageIndex + 1),
-            this.callbackDelay,
-            this.prompt,
-            this.promptDelay,
-            this.speaker,
-          ),
+          new MessagePhase(page1, this.callbackDelay, this.prompt, this.promptDelay, this.speaker),
         );
-        this.text = this.text.slice(0, pageIndex).trim();
+        this.text = page0.trim();
+      } else {
+        for (let p = 0; p < globalScene.getPlayerField().length; p++) {
+          this.text = this.text.split(repname[p]).join(pokename[p]);
+        }
       }
     }