diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
index 1c60b8054..f514fdff3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
@@ -169,13 +169,13 @@ public class MeleeWeapon extends Weapon {
 
 		if (Dungeon.hero.belongings.weapon == this) {
 			charger.partialCharge -= abilityChargeUse(hero);
-			while (charger.partialCharge < 0) {
+			while (charger.partialCharge < 0 && charger.charges > 0) {
 				charger.charges--;
 				charger.partialCharge++;
 			}
 		} else {
 			charger.secondPartialCharge -= abilityChargeUse(hero);
-			while (charger.secondPartialCharge < 0) {
+			while (charger.secondPartialCharge < 0 && charger.secondCharges > 0) {
 				charger.secondCharges--;
 				charger.secondPartialCharge++;
 			}