diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
index deccd55e27..5917c92bde 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
 	{
 		throwIfPresent(base);
 		
-		double baseValue = creature.getTemplate().getBaseValue(stat, 0);
+		double baseValue = calcWeaponPlusBaseValue(creature, stat);
 		if (creature.isPet())
 		{
 			final L2PetInstance pet = (L2PetInstance) creature;
-			baseValue = pet.getPetLevelData().getPetMaxMP();
+			baseValue += pet.getPetLevelData().getPetMaxMP();
 		}
 		else if (creature.isPlayer())
 		{
 			final L2PcInstance player = creature.getActingPlayer();
 			if (player != null)
 			{
-				baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
+				baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
 			}
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
index deccd55e27..5917c92bde 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
 	{
 		throwIfPresent(base);
 		
-		double baseValue = creature.getTemplate().getBaseValue(stat, 0);
+		double baseValue = calcWeaponPlusBaseValue(creature, stat);
 		if (creature.isPet())
 		{
 			final L2PetInstance pet = (L2PetInstance) creature;
-			baseValue = pet.getPetLevelData().getPetMaxMP();
+			baseValue += pet.getPetLevelData().getPetMaxMP();
 		}
 		else if (creature.isPlayer())
 		{
 			final L2PcInstance player = creature.getActingPlayer();
 			if (player != null)
 			{
-				baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
+				baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
 			}
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
index deccd55e27..5917c92bde 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
 	{
 		throwIfPresent(base);
 		
-		double baseValue = creature.getTemplate().getBaseValue(stat, 0);
+		double baseValue = calcWeaponPlusBaseValue(creature, stat);
 		if (creature.isPet())
 		{
 			final L2PetInstance pet = (L2PetInstance) creature;
-			baseValue = pet.getPetLevelData().getPetMaxMP();
+			baseValue += pet.getPetLevelData().getPetMaxMP();
 		}
 		else if (creature.isPlayer())
 		{
 			final L2PcInstance player = creature.getActingPlayer();
 			if (player != null)
 			{
-				baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
+				baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
 			}
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;