diff --git a/src/phases.ts b/src/phases.ts
index 08721c1e2ca..672f44b45ae 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -2023,12 +2023,13 @@ export class MovePhase extends BattlePhase {
     });
 
     const doMove = () => {
-      if (!this.followUp && this.canMove()) {
-        this.pokemon.lapseTags(BattlerTagLapseType.MOVE);
-        if (this.cancelled) {
-          this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL });
-          return this.end();
-        }
+      this.pokemon.lapseTags(BattlerTagLapseType.PRE_MOVE);
+      if (!this.followUp && this.canMove() && !this.cancelled) {
+            this.pokemon.lapseTags(BattlerTagLapseType.MOVE);
+      }
+      if (this.cancelled) {
+        this.pokemon.pushMoveHistory({ move: Moves.NONE, result: MoveResult.FAIL });
+        return this.end();
       }
 
       const moveQueue = this.pokemon.getMoveQueue();
@@ -4242,4 +4243,4 @@ export class TestMessagePhase extends MessagePhase {
   constructor(scene: BattleScene, message: string) {
     super(scene, message, null, true);
   }
-}
\ No newline at end of file
+}