diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index aa9af66624..f65fc99495 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14124,6 +14124,7 @@ public class PlayerInstance extends Playable
 				}
 				// Check if monster is reachable.
 				if (nearby.isAutoAttackable(this) //
+					&& GeoEngine.getInstance().canSeeTarget(this, nearby)//
 					&& GeoEngine.getInstance().canMoveToTarget(getX(), getY(), getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), getInstanceWorld()))
 				{
 					final double monsterDistance = calculateDistance2D(nearby);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 6f705db4b9..92ae754a4b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -14073,6 +14073,7 @@ public class PlayerInstance extends Playable
 				}
 				// Check if monster is reachable.
 				if (nearby.isAutoAttackable(this) //
+					&& GeoEngine.getInstance().canSeeTarget(this, nearby)//
 					&& GeoEngine.getInstance().canMoveToTarget(getX(), getY(), getZ(), nearby.getX(), nearby.getY(), nearby.getZ(), getInstanceWorld()))
 				{
 					final double monsterDistance = calculateDistance2D(nearby);