diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 27d08cdb9..d11576e22 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -366,6 +366,10 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
                 break;
             }
             case SPELLFAMILY_MAGE:
+                // remove Arcane Blast buffs at any non-Arcane Blast arcane damage spell.
+                // NOTE: it removed at hit instead cast because currently spell done-damage calculated at hit instead cast
+                if ((m_spellInfo->SchoolMask & SPELL_SCHOOL_MASK_ARCANE) && !(m_spellInfo->SpellFamilyFlags & UI64LIT(0x20000000)))
+                    m_caster->RemoveAurasDueToSpell(36032); // Arcane Blast buff
                 break;
             case SPELLFAMILY_WARRIOR:
             {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 76c1b8d4f..4085c7e08 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 "9029"
+ #define REVISION_NR "9030"
 #endif // __REVISION_NR_H__