diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index 8b44655c7d..d34df4ca2f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
 		if (npc.getClanId() > 0)
 		{
 			final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
-			if (clan != null)
+			if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
 			{
 				_clanId = clan.getId();
 				_clanCrest = clan.getCrestId();