diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java
index 418b99547f..1d0eb0ef0d 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/HuntPass.java
@@ -218,7 +218,7 @@ public class HuntPass
 	
 	public void setCurrentStep(int step)
 	{
-		_currentStep = step;
+		_currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1));
 	}
 	
 	public int getRewardStep()
@@ -233,7 +233,7 @@ public class HuntPass
 			return;
 		}
 		
-		_rewardStep = Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1);
+		_rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1));
 	}
 	
 	public boolean isPremium()
@@ -253,7 +253,7 @@ public class HuntPass
 	
 	public void setPremiumRewardStep(int step)
 	{
-		_premiumRewardStep = Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1);
+		_premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1));
 	}
 	
 	public boolean rewardAlert()
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java
index f24053965c..70edf397a8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/HuntPass.java
@@ -218,7 +218,7 @@ public class HuntPass
 	
 	public void setCurrentStep(int step)
 	{
-		_currentStep = step;
+		_currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1));
 	}
 	
 	public int getRewardStep()
@@ -233,7 +233,7 @@ public class HuntPass
 			return;
 		}
 		
-		_rewardStep = Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1);
+		_rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1));
 	}
 	
 	public boolean isPremium()
@@ -253,7 +253,7 @@ public class HuntPass
 	
 	public void setPremiumRewardStep(int step)
 	{
-		_premiumRewardStep = Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1);
+		_premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1));
 	}
 	
 	public boolean rewardAlert()
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java
index e112379764..b89e81f628 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/HuntPass.java
@@ -218,7 +218,7 @@ public class HuntPass
 	
 	public void setCurrentStep(int step)
 	{
-		_currentStep = step;
+		_currentStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1));
 	}
 	
 	public int getRewardStep()
@@ -233,7 +233,7 @@ public class HuntPass
 			return;
 		}
 		
-		_rewardStep = Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1);
+		_rewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getRewardsCount() - 1));
 	}
 	
 	public boolean isPremium()
@@ -253,7 +253,7 @@ public class HuntPass
 	
 	public void setPremiumRewardStep(int step)
 	{
-		_premiumRewardStep = Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1);
+		_premiumRewardStep = Math.max(0, Math.min(step, HuntPassData.getInstance().getPremiumRewardsCount() - 1));
 	}
 	
 	public boolean rewardAlert()