diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
index 58b4c2a7bd..a154255bdc 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
@@ -1006,10 +1006,10 @@ public class ClanHallManagerInstance extends FolkInstance
 	{
 		if (_clanHallId < 0)
 		{
-			final ClanHall temp = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), 1500);
-			if (temp != null)
+			final ClanHall clanHall = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), getNpcId() == 35421 ? 1500 : 500); // Also check for devastated castle.
+			if (clanHall != null)
 			{
-				_clanHallId = temp.getId();
+				_clanHallId = clanHall.getId();
 			}
 			
 			if (_clanHallId < 0)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
index 58b4c2a7bd..a154255bdc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
@@ -1006,10 +1006,10 @@ public class ClanHallManagerInstance extends FolkInstance
 	{
 		if (_clanHallId < 0)
 		{
-			final ClanHall temp = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), 1500);
-			if (temp != null)
+			final ClanHall clanHall = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), getNpcId() == 35421 ? 1500 : 500); // Also check for devastated castle.
+			if (clanHall != null)
 			{
-				_clanHallId = temp.getId();
+				_clanHallId = clanHall.getId();
 			}
 			
 			if (_clanHallId < 0)