diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
index 4e9b653682..49d0df5bcd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetActionMenu.java
@@ -50,7 +50,7 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
 		{
 			if (_objectId == object.getObjectId())
 			{
-				if (object.isAutoAttackable(player))
+				if (object.isTargetable() && object.isAutoAttackable(player))
 				{
 					player.setTarget(object);
 				}