diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 51002a4f8e1..0a7f4327766 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2433,6 +2433,14 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         {
             if (!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
             {
+                // General override, we don't want to use max spell range here.
+                // Note: 0.0 radius is also for index 36. It is possible that 36 must be defined as
+                // "at the base of", in difference to 0 which appear to be "directly in front of".
+                // TODO: some summoned will make caster be half inside summoned object. Need to fix
+                // that in the below code (nearpoint vs closepoint, etc).
+                if (m_spellInfo->EffectRadiusIndex[effIndex] == 0)
+                    radius = 0.0f;
+
                 if (m_spellInfo->Id == 50019)               // Hawk Hunting, problematic 50K radius
                     radius = 10.0f;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b2f357b4feb..b0d7e4e7f37 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11075"
+ #define REVISION_NR "11076"
 #endif // __REVISION_NR_H__