diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs
index ed94efe33..f90d34148 100644
--- a/Source/Game/Spells/Auras/AuraEffect.cs
+++ b/Source/Game/Spells/Auras/AuraEffect.cs
@@ -966,7 +966,6 @@ namespace Game.Spells
         [AuraEffectHandler(AuraType.Unk46)]
         [AuraEffectHandler(AuraType.Unk48)]
         [AuraEffectHandler(AuraType.PetDamageMulti)]
-        [AuraEffectHandler(AuraType.DetectAmore)]
         [AuraEffectHandler(AuraType.ModCriticalThreat)]
         [AuraEffectHandler(AuraType.ModCooldown)]
         [AuraEffectHandler(AuraType.Unk214)]
diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index 14e923ae9..335c2507c 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -4043,9 +4043,12 @@ namespace Game.Spells
             if (effectHandleMode == SpellEffectHandleMode.Launch)
             {
                 Position pos = destTarget.GetPosition();
-                float angle = m_caster.GetRelativeAngle(pos.posX, pos.posY);
-                float dist = m_caster.GetDistance(pos);
-                pos = m_caster.GetFirstCollisionPosition(dist, angle);
+                if (!m_caster.IsWithinLOS(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()))
+                {
+                    float angle = m_caster.GetRelativeAngle(pos.posX, pos.posY);
+                    float dist = m_caster.GetDistance(pos);
+                    pos = m_caster.GetFirstCollisionPosition(dist, angle);
+                }
 
                 m_caster.GetMotionMaster().MoveCharge(pos.posX, pos.posY, pos.posZ);
             }