diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 58e1161df7..04b8e99169 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusMAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusMAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e2e02668b1..d29fb5a78e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusPAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusPAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 58e1161df7..04b8e99169 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusMAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusMAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e2e02668b1..d29fb5a78e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusPAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusPAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 58e1161df7..04b8e99169 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusMAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusMAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e2e02668b1..d29fb5a78e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusPAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusPAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index aaf869b02a..e023e57020 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusMAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusMAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 79dea5c895..ae50078d89 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusPAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusPAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index aaf869b02a..e023e57020 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusMAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusMAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 79dea5c895..ae50078d89 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusPAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusPAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index aaf869b02a..e023e57020 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -36,8 +36,13 @@ public class MAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusMAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusMAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 79dea5c895..ae50078d89 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -36,8 +36,13 @@ public class PAttackFinalizer implements IStatFunction
 		throwIfPresent(base);
 		
 		double baseValue = calcWeaponBaseValue(creature, stat);
-		baseValue += creature.getStat().getWeaponBonusPAtk();
+		if (creature.getActiveWeaponInstance() != null)
+		{
+			baseValue += creature.getStat().getWeaponBonusPAtk();
+		}
+		
 		baseValue += calcEnchantedItemBonus(creature, stat);
+		
 		if (creature.isPlayer())
 		{
 			// Enchanted chest bonus