diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp
index 884e4ff727..d9077dac27 100644
--- a/src/game/Spells/Spell.cpp
+++ b/src/game/Spells/Spell.cpp
@@ -694,6 +694,7 @@ void Spell::FillTargetMap()
         {
             SendCastResult(SPELL_FAILED_IMMUNE); // guessed error
             finish(false);
+            return;
         }
     }
 
@@ -706,9 +707,10 @@ void Spell::FillTargetMap()
                 for (auto& ihit : m_UniqueTargetInfo)
                 {
                     ihit.effectHitMask = 0;
-                    ihit.effectMask = 0;
+                    ihit.missCondition = SPELL_MISS_IMMUNE2;
+                    ihit.effectDuration = 0;
                 }
-                return;
+                m_duration = 0;
             }
         }
     }