diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 1e848b0a4..44b35a35c 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -542,9 +542,12 @@ class spell_warr_intimidating_shout : public SpellScript
 {
     PrepareSpellScript(spell_warr_intimidating_shout);
 
-    void FilterTargets(std::list<WorldObject*>& unitList)
+    void FilterTargets(std::list<WorldObject*>& targets)
     {
-        unitList.remove(GetExplTargetWorldObject());
+        targets.remove(GetExplTargetWorldObject());
+        uint32 maxTargets = GetSpellInfo()->MaxAffectedTargets;
+        if (targets.size() > maxTargets)
+            targets.resize(maxTargets);
     }
 
     void Register() override