diff --git a/data/abilities.js b/data/abilities.js
index d73d5066fa..f3c547f880 100644
--- a/data/abilities.js
+++ b/data/abilities.js
@@ -1290,8 +1290,8 @@ let BattleAbilities = {
 			pokemon.abilityData.choiceLock = "";
 		},
 		onBeforeMove(pokemon, target, move) {
+			if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
 			if (pokemon.abilityData.choiceLock && pokemon.abilityData.choiceLock !== move.id) {
-				if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
 				// Fails unless ability is being ignored (these events will not run), no PP lost.
 				this.addMove('move', pokemon, move.name);
 				this.attrLastMove('[still]');
@@ -1301,6 +1301,7 @@ let BattleAbilities = {
 			}
 		},
 		onModifyMove(move, pokemon) {
+			if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
 			pokemon.abilityData.choiceLock = move.id;
 		},
 		onModifyAtkPriority: 1,