diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index f56cc1633..290fde49f 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1599,8 +1599,8 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
         }
         case SPELLFAMILY_WARRIOR:
         {
-            // Sunder Armor
-            if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000004000), 0x00000000))
+            // Sunder Armor (main spell)
+            if (m_spellInfo->IsFitToFamilyMask(UI64LIT(0x0000000000004000), 0x00000000) && m_spellInfo->SpellVisual[0] == 406)
                 if (m_caster->HasAura(58387))               // Glyph of Sunder Armor
                     EffectChainTarget = 2;
             break;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f68bf5c2d..7a96508bf 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 "11659"
+ #define REVISION_NR "11660"
 #endif // __REVISION_NR_H__