diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index 72cfd63c3bc..162e431d6d5 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -63,8 +63,8 @@ export class CommandPhase extends FieldPhase {
 
     // Checks if the Pokemon is under the effects of Encore. If so, Encore can end early if the encored move has no more PP.
     const encoreTag = this.getPokemon().getTag(BattlerTagType.ENCORE) as EncoreTag;
-    if (encoreTag && !encoreTag.lapse(this.getPokemon(), BattlerTagLapseType.CUSTOM)) {
-      this.getPokemon().removeTag(BattlerTagType.ENCORE);
+    if (encoreTag) {
+      this.getPokemon().lapseTag(BattlerTagType.ENCORE);
     }
 
     if (this.scene.currentBattle.turnCommands[this.fieldIndex]?.skip) {