diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
index 9dfbd77e06..6d790e4d66 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
@@ -295,7 +295,9 @@ public class CreatureStatus
 	
 	public void setCurrentHpMp(double newHp, double newMp)
 	{
-		if (setCurrentHp(newHp, false) || setCurrentMp(newMp, false))
+		final boolean hpChanged = setCurrentHp(newHp, false);
+		final boolean mpChanged = setCurrentMp(newMp, false);
+		if (hpChanged || mpChanged)
 		{
 			_creature.broadcastStatusUpdate();
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
index 9dfbd77e06..6d790e4d66 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
@@ -295,7 +295,9 @@ public class CreatureStatus
 	
 	public void setCurrentHpMp(double newHp, double newMp)
 	{
-		if (setCurrentHp(newHp, false) || setCurrentMp(newMp, false))
+		final boolean hpChanged = setCurrentHp(newHp, false);
+		final boolean mpChanged = setCurrentMp(newMp, false);
+		if (hpChanged || mpChanged)
 		{
 			_creature.broadcastStatusUpdate();
 		}