diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
index 946f2ec02..e7c03a53e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java
@@ -341,17 +341,20 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action {
 					return;
 				}
 
+				if (Buff.affect(hero, MonkEnergy.class).abilitiesEmpowered(hero)){
+					Buff.affect(hero, FlurryEmpowerTracker.class, 0f);
+				}
+
 				UnarmedAbilityTracker tracker = Buff.affect(hero, UnarmedAbilityTracker.class);
 				if (!hero.canAttack(enemy)){
 					GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position"));
 					tracker.detach();
+					if (hero.buff(FlurryEmpowerTracker.class) != null){
+						hero.buff(FlurryEmpowerTracker.class).detach();
+					}
 					return;
 				}
 
-				if (Buff.affect(hero, MonkEnergy.class).abilitiesEmpowered(hero)){
-					Buff.affect(hero, FlurryEmpowerTracker.class, 0f);
-				}
-
 				hero.sprite.attack(enemy.pos, new Callback() {
 					@Override
 					public void call() {