diff --git a/src/battle_main.c b/src/battle_main.c
index 6320770eb..439876325 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3140,6 +3140,7 @@ void FaintClearSetData(void)
     gProtectStructs[gActiveBattler].spikyShielded = FALSE;
     gProtectStructs[gActiveBattler].kingsShielded = FALSE;
     gProtectStructs[gActiveBattler].banefulBunkered = FALSE;
+    gProtectStructs[gActiveBattler].quash = FALSE;
     gProtectStructs[gActiveBattler].obstructed = FALSE;
     gProtectStructs[gActiveBattler].endured = FALSE;
     gProtectStructs[gActiveBattler].noValidMoves = FALSE;
@@ -4739,7 +4740,7 @@ static void TurnValuesCleanUp(bool8 var0)
             gProtectStructs[gActiveBattler].spikyShielded = FALSE;
             gProtectStructs[gActiveBattler].kingsShielded = FALSE;
             gProtectStructs[gActiveBattler].banefulBunkered = FALSE;
-            gProtectStructs[gBattlerTarget].quash = FALSE;
+            gProtectStructs[gActiveBattler].quash = FALSE;
         }
         else
         {