diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 0926a98894..53a9183db3 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -190,7 +190,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 239316efeb..f7b696f050 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -191,7 +191,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 239316efeb..f7b696f050 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -191,7 +191,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index f6ab18d9fd..f79939b86f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -191,7 +191,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 5e47d26276..e98d9bee2a 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d596e1fe58..e6d3f4edc3 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d596e1fe58..e6d3f4edc3 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 7394de3dd7..d9647a5c67 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 4ebb5ed3ab..90f24e0874 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 4ebb5ed3ab..90f24e0874 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 1aa6ad3b06..1ad64e561a 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 1aa6ad3b06..1ad64e561a 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index f94d0e00ce..b53d343d58 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -174,7 +174,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_EXPERIENCE);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_EXPERIENCE_AND_S2_SP);
 			sm.addLong((long) addToExp);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 0d758888b8..26a6e99c95 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -182,7 +182,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_EXPERIENCE);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_EXPERIENCE_AND_S2_SP);
 			sm.addLong((long) addToExp);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index a1b16ee51e..bddbbac503 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -204,7 +204,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_EXPERIENCE);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			if ((addToExp - baseExp) > 0)
 			{
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 1708fb1bab..7ed710356c 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -189,7 +189,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 1708fb1bab..7ed710356c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -189,7 +189,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 634bdcc4d8..2e4870d77f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -190,7 +190,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index f6ab18d9fd..f79939b86f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -191,7 +191,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 4c0a2e9339..10ff7998e8 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -191,7 +191,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d3f0215a33..0c1d93002a 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -192,7 +192,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d3f0215a33..0c1d93002a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -192,7 +192,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d3f0215a33..0c1d93002a 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -192,7 +192,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index c33237757b..e53d3b4702 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -192,7 +192,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index f6ab18d9fd..f79939b86f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -191,7 +191,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index ea4c9b6021..d37f23b40c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -192,7 +192,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index ea4c9b6021..d37f23b40c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -192,7 +192,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 6098d996a3..f67d0ae591 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -194,7 +194,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 6098d996a3..f67d0ae591 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -194,7 +194,7 @@ public class PlayerStat extends PlayableStat
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP);
 			sm.addLong(finalExp);
 		}
-		else
+		else if ((finalExp > 0) || (finalSp > 0))
 		{
 			sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4);
 			sm.addLong(finalExp);