diff --git a/sql/mangos.sql b/sql/mangos.sql
index f2faeb35e..7af4ddbe5 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -16630,7 +16630,7 @@ INSERT INTO spell_chain VALUES
 (58580,25525,5730,8,0),
 (58581,58580,5730,9,0),
 (58582,58581,5730,10,0),
-/*Totemof Wrath*/
+/*Totem of Wrath*/
 (30706,0,30706,1,0),
 (57720,30706,30706,2,0),
 (57721,57720,30706,3,0),
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 699e6ce5d..2a96b6941 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2661,6 +2661,9 @@ void Spell::cast(bool skipCheck)
             // Heroism
             else if (m_spellInfo->Id == 32182)
                 AddPrecastSpell(57723);                     // Exhaustion
+            else if (m_spellInfo->Effect[EFFECT_INDEX_0]==SPELL_EFFECT_APPLY_AREA_AURA_RAID && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000004000000))
+                // only for main totem spell cast
+                AddTriggeredSpell(30708);                   // Totem of Wrath
             break;
         }
         default:
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index c23ae4444..87f7e5ee0 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1730,6 +1730,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                 // Ghost Wolf
                 if (spellInfo_1->SpellIconID == 67 && spellInfo_2->SpellIconID == 67)
                     return false;
+
+                // Totem of Wrath (positive/negative), ranks checked early
+                if (spellInfo_1->SpellIconID == 2019 && spellInfo_2->SpellIconID == 2019)
+                    return false;
             }
             // Bloodlust and Bloodthirst (multi-family check)
             if( spellInfo_1->Id == 2825 && spellInfo_2->SpellIconID == 38 && spellInfo_2->SpellVisual[0] == 0 )
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1c33d6551..b5bbb810f 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 "9473"
+ #define REVISION_NR "9474"
 #endif // __REVISION_NR_H__