diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 15a8397860..408f070255 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -123,7 +123,7 @@ public class NotFriend implements IAffectObjectHandler
 				}
 				
 				// At this point summon should be prevented from attacking friendly targets.
-				if (activeChar.isSummon())
+				if (activeChar.isSummon() && (target == activeChar.getTarget()))
 				{
 					return true;
 				}