diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index cc159a613c..cbfa739fb6 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2814,13 +2814,13 @@ uint32 Spell::SelectEffectTargets(uint32 i, SpellImplicitTargetInfo const& cur)
                     unitList.remove(m_targets.GetUnitTarget());
                 Trinity::RandomResizeList(unitList, maxTargets);
             }
+
+            CallScriptAfterUnitTargetSelectHandlers(unitList, SpellEffIndex(i));
+
+            for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr)
+                AddUnitTarget(*itr, effectMask, false);
         }
 
-        CallScriptAfterUnitTargetSelectHandlers(unitList, SpellEffIndex(i));
-
-        for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr)
-            AddUnitTarget(*itr, effectMask, false);
-
         if (!gobjectList.empty())
         {
             if (uint32 maxTargets = m_spellValue->MaxAffectedTargets)