diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs
index 6a35f2f2a..8a0de2f6a 100644
--- a/Source/Game/Entities/Unit/Unit.cs
+++ b/Source/Game/Entities/Unit/Unit.cs
@@ -597,6 +597,12 @@ namespace Game.Entities
         public void AtEndOfEncounter()
         {
             RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.EndOfEncounter);
+
+            GetSpellHistory().ResetCooldowns(pair =>
+            {
+                SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(pair.Key, Difficulty.None);
+                return spellInfo.HasAttribute(SpellAttr10.ResetCooldownOnEncounterEnd);
+            }, true);
         }
 
         public void _RegisterDynObject(DynamicObject dynObj)