diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs
index 158bdd584..85dc0f299 100644
--- a/Source/Game/Spells/Spell.cs
+++ b/Source/Game/Spells/Spell.cs
@@ -302,6 +302,8 @@ namespace Game.Spells
                     float dist = m_caster.GetExactDist(m_targets.GetDstPos());
                     return (ulong)(Math.Floor((dist / m_spellInfo.Speed + launchDelay) * 1000.0f));
                 }
+
+                return (ulong)Math.Floor(launchDelay * 1000.0f);
             }
 
             return 0;
@@ -2913,6 +2915,9 @@ namespace Game.Spells
                 }
             }
 
+            if (single_missile && t_offset == 0)
+                return m_delayMoment;
+
             if (m_caster.IsTypeId(TypeId.Player))
                 m_caster.ToPlayer().SetSpellModTakingSpell(this, true);