diff --git a/Source/Game/Combat/ThreatManager.cs b/Source/Game/Combat/ThreatManager.cs
index 7139ed92a..5972d44d6 100644
--- a/Source/Game/Combat/ThreatManager.cs
+++ b/Source/Game/Combat/ThreatManager.cs
@@ -46,6 +46,14 @@ namespace Game.Combat
             if (!Owner.CanHaveThreatList() || Owner.HasUnitState(UnitState.Evade))
                 return;
 
+            if (Owner.IsControlledByPlayer() || victim.IsControlledByPlayer())
+            {
+                if (Owner.IsFriendlyTo(victim) || victim.IsFriendlyTo(Owner))
+                    return;
+            }
+            else if (!Owner.IsHostileTo(victim) && !victim.IsHostileTo(Owner))
+                return;
+
             Owner.SetInCombatWith(victim);
             victim.SetInCombatWith(Owner);
             AddThreat(victim, amount, spell != null ? spell.GetSchoolMask() : victim.GetMeleeDamageSchoolMask(), spell);