diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index a16e328341..cd2d96339c 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -7544,7 +7544,9 @@ bool Spell::IsChannelActive() const
 
 bool Spell::IsAutoActionResetSpell() const
 {
-    if (IsTriggered())
+    // @todo: The check for interrupt flags is most likely not correct but the only clue that we have right now for known cases
+    // Ice lance resets swing timer >> has interrupt flags / Frost Shock does not >> has no interrupt flags
+    if (IsTriggered() || !m_spellInfo->InterruptFlags.HasAnyFlag())
         return false;
 
     if (!m_casttime && m_spellInfo->HasAttribute(SPELL_ATTR6_NOT_RESET_SWING_IF_INSTANT))