diff --git a/data/moves.js b/data/moves.js
index 55b3e2354a..d7c332f542 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -3075,8 +3075,8 @@ exports.BattleMovedex = {
 					this.effectData.duration++;
 				}
 			},
-			onOverrideDecision: function(pokemon) {
-				return this.effectData.move;
+			onOverrideDecision: function(pokemon, target, move) {
+				if (move.id !== this.effectData.move) return this.effectData.move;
 			},
 			onResidualOrder: 13,
 			onResidual: function(target) {
diff --git a/data/scripts.js b/data/scripts.js
index 4e099a6507..c415148ec1 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -2,7 +2,7 @@ exports.BattleScripts = {
 	gen: 5,
 	runMove: function(move, pokemon, target, sourceEffect) {
 		if (!sourceEffect && toId(move) !== 'struggle') {
-			var changedMove = this.runEvent('OverrideDecision', pokemon);
+			var changedMove = this.runEvent('OverrideDecision', pokemon, target, move);
 			if (changedMove && changedMove !== true) {
 				move = changedMove;
 				target = null;