diff --git a/src/data/move.ts b/src/data/move.ts
index fd55bc920..49865a9e5 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -4790,7 +4790,7 @@ export function initMoves() {
       .ignoresVirtual(),
     new SelfStatusMove(Moves.CHARGE, Type.ELECTRIC, -1, 20, -1, 0, 3)
       .attr(StatChangeAttr, BattleStat.SPDEF, 1, true)
-      .attr(AddBattlerTagAttr, BattlerTagType.CHARGED, true, true),
+      .attr(AddBattlerTagAttr, BattlerTagType.CHARGED, true, false),
     new StatusMove(Moves.TAUNT, Type.DARK, 100, 20, -1, 0, 3)
       .unimplemented(),
     new StatusMove(Moves.HELPING_HAND, Type.NORMAL, -1, 20, -1, 5, 3)
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 1ba88e05a..758e25246 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1324,7 +1324,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           if (typeBoost) {
             power.value *= typeBoost.boostValue;
             if (typeBoost.oneUse) {
-              this.removeTag(typeBoost.tagType);
+              source.removeTag(typeBoost.tagType);
             }
           }
           const arenaAttackTypeMultiplier = this.scene.arena.getAttackTypeMultiplier(type, source.isGrounded());