diff --git a/include/constants/battle.h b/include/constants/battle.h
index 012b8986ef..d2913d6fc6 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -160,7 +160,6 @@ enum VolatileFlags
     F(VOLATILE_INFATUATION,                 infatuation,                   (enum BattlerId, MAX_BITS(4))) \
     F(VOLATILE_DEFENSE_CURL,                defenseCurl,                   (u32, 1)) \
     F(VOLATILE_TRANSFORMED,                 transformed,                   (u32, 1)) \
-    F(VOLATILE_RECHARGE,                    recharge,                      (u32, 1)) \
     F(VOLATILE_RAGE,                        rage,                          (u32, 1)) \
     F(VOLATILE_SUBSTITUTE,                  substitute,                    (u32, 1), V_BATON_PASSABLE) \
     F(VOLATILE_DESTINY_BOND,                destinyBond,                   (u32, 1)) \
diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c
index 353705cefc..8bed0234ee 100644
--- a/src/battle_ai_util.c
+++ b/src/battle_ai_util.c
@@ -3435,7 +3435,7 @@ bool32 IsBattlerIncapacitated(u32 battler, u32 ability)
     if (gBattleMons[battler].status1 & STATUS1_SLEEP && !HasMoveWithEffect(battler, EFFECT_SLEEP_TALK))
         return TRUE;
 
-    if (gBattleMons[battler].volatiles.recharge || (ability == ABILITY_TRUANT && gDisableStructs[battler].truantCounter != 0))
+    if (gDisableStructs[battler].rechargeTimer > 0 || (ability == ABILITY_TRUANT && gDisableStructs[battler].truantCounter != 0))
         return TRUE;
 
     return FALSE;
diff --git a/src/battle_debug.c b/src/battle_debug.c
index 149cb4065c..b160dd9d78 100644
--- a/src/battle_debug.c
+++ b/src/battle_debug.c
@@ -361,7 +361,6 @@ static const struct ListMenuItem sVolatileStatusListItems[] =
     {COMPOUND_STRING("Torment"),            VOLATILE_TORMENT},
     {COMPOUND_STRING("Powder"),             VOLATILE_POWDER},
     {COMPOUND_STRING("DefenseCurl"),        VOLATILE_DEFENSE_CURL},
-    {COMPOUND_STRING("Recharge"),           VOLATILE_RECHARGE},
     {COMPOUND_STRING("Rage"),               VOLATILE_RAGE},
     {COMPOUND_STRING("DestinyBond"),        VOLATILE_DESTINY_BOND},
     {COMPOUND_STRING("EscapePrevention"),   VOLATILE_ESCAPE_PREVENTION},
diff --git a/src/battle_main.c b/src/battle_main.c
index 15dfe0a3e4..702550c22d 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4213,7 +4213,7 @@ static void HandleTurnActionSelectionState(void)
                 else
                 {
                     if (gBattleMons[battler].volatiles.multipleTurns
-                        || gBattleMons[battler].volatiles.recharge)
+                        || gDisableStructs[battler].rechargeTimer > 0)
                     {
                         gChosenActionByBattler[battler] = B_ACTION_USE_MOVE;
                         gBattleCommunication[battler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
@@ -4368,7 +4368,7 @@ static void HandleTurnActionSelectionState(void)
                     gBattleCommunication[GetPartnerBattler(battler)] = STATE_BEFORE_ACTION_CHOSEN;
                     RecordedBattle_ClearBattlerAction(battler, 1);
                     if (gBattleMons[GetPartnerBattler(battler)].volatiles.multipleTurns
-                        || gBattleMons[GetPartnerBattler(battler)].volatiles.recharge)
+                        || gDisableStructs[GetPartnerBattler(battler)].rechargeTimer > 0)
                     {
                         BtlController_EmitEndBounceEffect(battler, B_COMM_TO_CONTROLLER);
                         MarkBattlerForControllerExec(battler);
@@ -5132,11 +5132,8 @@ static void TurnValuesCleanUp(bool8 var0)
                 gDisableStructs[i].isFirstTurn--;
 
             if (gDisableStructs[i].rechargeTimer)
-            {
                 gDisableStructs[i].rechargeTimer--;
-                if (gDisableStructs[i].rechargeTimer == 0)
-                    gBattleMons[i].volatiles.recharge = FALSE;
-            }
+
             gBattleStruct->battlerState[i].canPickupItem = FALSE;
         }
 
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 3d4bd61613..ca7f490f11 100755
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3314,7 +3314,6 @@ void SetMoveEffect(u32 battler, u32 effectBattler, bool32 primary, bool32 certai
         if (B_SKIP_RECHARGE == GEN_1 && !IsBattlerAlive(gBattlerTarget))  // Skip recharge if gen 1 and foe is KO'd
             break;
 
-        gBattleMons[gEffectBattler].volatiles.recharge = TRUE;
         gDisableStructs[gEffectBattler].rechargeTimer = 2;
         gLockedMoves[gEffectBattler] = gCurrentMove;
         gBattlescriptCurrInstr++;
diff --git a/src/battle_util.c b/src/battle_util.c
index c3cd8c5b54..f6a61ffde4 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -406,7 +406,7 @@ void HandleAction_UseMove(void)
         gHitMarker |= HITMARKER_NO_PPDEDUCT;
         gBattleStruct->moveTarget[gBattlerAttacker] = GetBattleMoveTarget(MOVE_STRUGGLE, NO_TARGET_OVERRIDE);
     }
-    else if (gBattleMons[gBattlerAttacker].volatiles.multipleTurns || gBattleMons[gBattlerAttacker].volatiles.recharge)
+    else if (gBattleMons[gBattlerAttacker].volatiles.multipleTurns || gDisableStructs[gBattlerAttacker].rechargeTimer > 0)
     {
         gCurrentMove = gChosenMove = gLockedMoves[gBattlerAttacker];
     }
@@ -1928,10 +1928,8 @@ static enum MoveCanceller CancellerSkyDrop(void)
 
 static enum MoveCanceller CancellerRecharge(void)
 {
-    if (gBattleMons[gBattlerAttacker].volatiles.recharge)
+    if (gDisableStructs[gBattlerAttacker].rechargeTimer > 0)
     {
-        gBattleMons[gBattlerAttacker].volatiles.recharge = FALSE;
-        gDisableStructs[gBattlerAttacker].rechargeTimer = 0;
         CancelMultiTurnMoves(gBattlerAttacker, SKY_DROP_ATTACKCANCELLER_CHECK);
         gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge;
         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
diff --git a/test/battle/move_effect_secondary/recharge.c b/test/battle/move_effect_secondary/recharge.c
new file mode 100644
index 0000000000..9146083675
--- /dev/null
+++ b/test/battle/move_effect_secondary/recharge.c
@@ -0,0 +1,52 @@
+#include "global.h"
+#include "test/battle.h"
+
+ASSUMPTIONS
+{
+    ASSUME(MoveHasAdditionalEffectSelf(MOVE_METEOR_ASSAULT, MOVE_EFFECT_RECHARGE) == TRUE);
+}
+
+SINGLE_BATTLE_TEST("Recharge moves make the user unable to attack for exactly one turn")
+{
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET) { }
+        OPPONENT(SPECIES_WOBBUFFET) { }
+    } WHEN {
+        TURN { MOVE(player, MOVE_METEOR_ASSAULT);}
+        TURN { SKIP_TURN(player);}
+        TURN { MOVE(player, MOVE_TACKLE);}
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_METEOR_ASSAULT, player);
+        MESSAGE("Wobbuffet must recharge!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, player);
+    }
+}
+
+SINGLE_BATTLE_TEST("Recharge moves don't timeout when all battlers are recharging")
+{
+
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET) { }
+        OPPONENT(SPECIES_WOBBUFFET) { }
+    } WHEN {
+        TURN { MOVE(player, MOVE_METEOR_ASSAULT); MOVE(opponent, MOVE_METEOR_ASSAULT);}
+    }
+}
+
+DOUBLE_BATTLE_TEST("Recharge moves don't timeout when all battlers are recharging (doubles")
+{
+
+    GIVEN {
+        PLAYER(SPECIES_WOBBUFFET) { }
+        PLAYER(SPECIES_WYNAUT) { }
+        OPPONENT(SPECIES_WOBBUFFET) { }
+        OPPONENT(SPECIES_WYNAUT) { }
+    } WHEN {
+        TURN {
+            MOVE(playerLeft, MOVE_METEOR_ASSAULT, target: opponentLeft);
+            MOVE(playerRight, MOVE_METEOR_ASSAULT, target: opponentRight);
+            MOVE(opponentLeft, MOVE_METEOR_ASSAULT, target: playerLeft);
+            MOVE(opponentRight, MOVE_METEOR_ASSAULT, target: playerRight);
+        }
+    }
+}