diff --git a/src/data/ability.ts b/src/data/ability.ts
index ae707a51098..60b47e67373 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -6281,7 +6281,8 @@ export function initAbilities() {
     new Ability(Abilities.COMMANDER, 9)
       .attr(CommanderAbAttr)
       .attr(UncopiableAbilityAbAttr)
-      .attr(UnswappableAbilityAbAttr),
+      .attr(UnswappableAbilityAbAttr)
+      .edgeCase(), // Encore, Frenzy, and other non-`TURN_END` tags don't lapse correctly on the commanding Pokemon.
     new Ability(Abilities.ELECTROMORPHOSIS, 9)
       .attr(PostDefendApplyBattlerTagAbAttr, (target, user, move) => move.category !== MoveCategory.STATUS, BattlerTagType.CHARGED),
     new Ability(Abilities.PROTOSYNTHESIS, 9)