diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
index 075fbfa083..10466e04dc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -131,7 +131,11 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
 		{
 			_params = Arrays.copyOf(_params, _paramIndex + 1);
 			_smId.setParamCount(_paramIndex + 1);
-			_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			// Mobius: With additional on-screen damage param (popup), length is increased.
+			if (param.getType() != TYPE_POPUP_ID)
+			{
+				_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			}
 		}
 		
 		_params[_paramIndex++] = param;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
index 4160658f49..16c17c043b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -131,7 +131,11 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
 		{
 			_params = Arrays.copyOf(_params, _paramIndex + 1);
 			_smId.setParamCount(_paramIndex + 1);
-			_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			// Mobius: With additional on-screen damage param (popup), length is increased.
+			if (param.getType() != TYPE_POPUP_ID)
+			{
+				_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			}
 		}
 		
 		_params[_paramIndex++] = param;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
index 4160658f49..16c17c043b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -131,7 +131,11 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
 		{
 			_params = Arrays.copyOf(_params, _paramIndex + 1);
 			_smId.setParamCount(_paramIndex + 1);
-			_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			// Mobius: With additional on-screen damage param (popup), length is increased.
+			if (param.getType() != TYPE_POPUP_ID)
+			{
+				_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			}
 		}
 		
 		_params[_paramIndex++] = param;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
index 106d602916..df42fbe646 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -132,7 +132,11 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
 		{
 			_params = Arrays.copyOf(_params, _paramIndex + 1);
 			_smId.setParamCount(_paramIndex + 1);
-			_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			// Mobius: With additional on-screen damage param (popup), length is increased.
+			if (param.getType() != TYPE_POPUP_ID)
+			{
+				_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			}
 		}
 		
 		_params[_paramIndex++] = param;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index cbd8bc35a6..1539a71bb1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -725,7 +725,7 @@ public abstract class L2Summon extends L2Playable
 				sm.addNpcName(this);
 				sm.addString(target.getName());
 				sm.addInt(damage);
-				// sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
+				sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
 			}
 			
 			sendPacket(sm);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
index a98e953e17..fa1b3c935f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
@@ -156,7 +156,7 @@ public class DoppelgangerInstance extends L2Npc
 				sm.addNpcName(this);
 				sm.addString(target.getName());
 				sm.addInt(damage);
-				// sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
+				sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
 			}
 			
 			sendPacket(sm);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 1bb1646cf9..4cd337b679 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -11504,7 +11504,7 @@ public final class L2PcInstance extends L2Playable
 			sm.addPcName(this);
 			sm.addString(target.getName());
 			sm.addInt(damage);
-			// sm.addPopup(target.getObjectId(), getObjectId(), -damage);
+			sm.addPopup(target.getObjectId(), getObjectId(), -damage);
 		}
 		sendPacket(sm);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
index 514c07c771..60e018bb0f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
@@ -275,7 +275,7 @@ public final class L2TrapInstance extends L2Npc
 			sm.addString(getName());
 			sm.addString(target.getName());
 			sm.addInt(damage);
-			// sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
+			sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
 			_owner.sendPacket(sm);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
index 4160658f49..16c17c043b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -131,7 +131,11 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
 		{
 			_params = Arrays.copyOf(_params, _paramIndex + 1);
 			_smId.setParamCount(_paramIndex + 1);
-			_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			// Mobius: With additional on-screen damage param (popup), length is increased.
+			if (param.getType() != TYPE_POPUP_ID)
+			{
+				_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			}
 		}
 		
 		_params[_paramIndex++] = param;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index cbd8bc35a6..1539a71bb1 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -725,7 +725,7 @@ public abstract class L2Summon extends L2Playable
 				sm.addNpcName(this);
 				sm.addString(target.getName());
 				sm.addInt(damage);
-				// sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
+				sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
 			}
 			
 			sendPacket(sm);
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
index a98e953e17..fa1b3c935f 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
@@ -156,7 +156,7 @@ public class DoppelgangerInstance extends L2Npc
 				sm.addNpcName(this);
 				sm.addString(target.getName());
 				sm.addInt(damage);
-				// sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
+				sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
 			}
 			
 			sendPacket(sm);
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 6b514bc162..30b52073c9 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -11504,7 +11504,7 @@ public final class L2PcInstance extends L2Playable
 			sm.addPcName(this);
 			sm.addString(target.getName());
 			sm.addInt(damage);
-			// sm.addPopup(target.getObjectId(), getObjectId(), -damage);
+			sm.addPopup(target.getObjectId(), getObjectId(), -damage);
 		}
 		sendPacket(sm);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
index 514c07c771..60e018bb0f 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
@@ -275,7 +275,7 @@ public final class L2TrapInstance extends L2Npc
 			sm.addString(getName());
 			sm.addString(target.getName());
 			sm.addInt(damage);
-			// sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
+			sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1));
 			_owner.sendPacket(sm);
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
index 106d602916..df42fbe646 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -132,7 +132,11 @@ public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>>
 		{
 			_params = Arrays.copyOf(_params, _paramIndex + 1);
 			_smId.setParamCount(_paramIndex + 1);
-			_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			// Mobius: With additional on-screen damage param (popup), length is increased.
+			if (param.getType() != TYPE_POPUP_ID)
+			{
+				_log.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId);
+			}
 		}
 		
 		_params[_paramIndex++] = param;