diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
index 37d6a07943..52cd896006 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
@@ -46,6 +46,11 @@ public class SpeedFinalizer implements IStatFunction
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
+			
+			// Match retail speed value.
+			// Verified on 4game EU server, protocol 286.
+			// Does not apply for Essence client.
+			baseValue += 50;
 		}
 		
 		final byte speedStat = (byte) creature.getStat().getAdd(Stat.STAT_BONUS_SPEED, -1);
@@ -56,11 +61,6 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		// Match retail speed value.
-		// Verified on 4game EU server, protocol 286.
-		// Does not apply for Essence client.
-		baseValue += 50;
-		
 		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayer() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
index 37d6a07943..52cd896006 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
@@ -46,6 +46,11 @@ public class SpeedFinalizer implements IStatFunction
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
+			
+			// Match retail speed value.
+			// Verified on 4game EU server, protocol 286.
+			// Does not apply for Essence client.
+			baseValue += 50;
 		}
 		
 		final byte speedStat = (byte) creature.getStat().getAdd(Stat.STAT_BONUS_SPEED, -1);
@@ -56,11 +61,6 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		// Match retail speed value.
-		// Verified on 4game EU server, protocol 286.
-		// Does not apply for Essence client.
-		baseValue += 50;
-		
 		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayer() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
 	}
 	
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
index 37d6a07943..52cd896006 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java
@@ -46,6 +46,11 @@ public class SpeedFinalizer implements IStatFunction
 		{
 			// Enchanted feet bonus
 			baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_FEET);
+			
+			// Match retail speed value.
+			// Verified on 4game EU server, protocol 286.
+			// Does not apply for Essence client.
+			baseValue += 50;
 		}
 		
 		final byte speedStat = (byte) creature.getStat().getAdd(Stat.STAT_BONUS_SPEED, -1);
@@ -56,11 +61,6 @@ public class SpeedFinalizer implements IStatFunction
 			baseValue += bonusDex;
 		}
 		
-		// Match retail speed value.
-		// Verified on 4game EU server, protocol 286.
-		// Does not apply for Essence client.
-		baseValue += 50;
-		
 		return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 1, creature.isPlayer() ? Config.MAX_RUN_SPEED : Double.MAX_VALUE);
 	}