diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index a3c2a73132..ee1733eb96 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -5542,6 +5542,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_skillCast = null;
 		_castInterruptTime = 0;
 		
+		// On each repeat recharge shots before cast.
+		if (mut.getCount() > 0)
+		{
+			rechargeShots(mut.getSkill().useSoulShot(), mut.getSkill().useSpiritShot());
+		}
+		
 		// Stop casting
 		setIsCastingNow(false);
 		setIsCastingSimultaneouslyNow(false);
@@ -5549,12 +5555,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		final Skill skill = mut.getSkill();
 		final WorldObject target = mut.getTargets().length > 0 ? mut.getTargets()[0] : null;
 		
-		// On each repeat recharge shots before cast.
-		if (mut.getCount() > 0)
-		{
-			rechargeShots(mut.getSkill().useSoulShot(), mut.getSkill().useSpiritShot());
-		}
-		
 		// Attack target after skill use
 		if ((skill.nextActionIsAttack()) && (_target != this) && (target != null) && (_target == target) && _target.isCreature() && target.canBeAttacked())
 		{