diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index a4d3dc642..24b0d5c56 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -4085,10 +4085,13 @@ namespace Game.Spells
             if (!unitTarget)
                 return;
 
-            Creature creatureTarget = unitTarget.ToCreature();
-            if (creatureTarget)
-                if (creatureTarget.IsWorldBoss() || creatureTarget.IsDungeonBoss())
-                    return;
+            if (m_caster.GetTypeId() == TypeId.Player || m_caster.GetOwnerGUID().IsPlayer() || m_caster.IsHunterPet())
+            {
+                Creature creatureTarget = unitTarget.ToCreature();
+                if (creatureTarget != null)
+                    if (creatureTarget.IsWorldBoss() || creatureTarget.IsDungeonBoss())
+                        return;
+            }
 
             // Spells with SPELL_EFFECT_KNOCK_BACK (like Thunderstorm) can't knockback target if target has ROOT/STUN
             if (unitTarget.HasUnitState(UnitState.Root | UnitState.Stunned))