diff --git a/Source/Game/Spells/SpellHistory.cs b/Source/Game/Spells/SpellHistory.cs
index 9119396c4..b5de68cb7 100644
--- a/Source/Game/Spells/SpellHistory.cs
+++ b/Source/Game/Spells/SpellHistory.cs
@@ -539,12 +539,6 @@ namespace Game.Spells
                     cooldownEntry.CooldownEnd = cooldownEntry.CategoryEnd;
             }
 
-            if (cooldownEntry.CooldownEnd <= now)
-            {                
-                _categoryCooldowns.Remove(cooldownEntry.CategoryId);
-                _spellCooldowns.Remove(cooldownEntry.SpellId);
-            }
-
             Player playerOwner = GetPlayerOwner();
             if (playerOwner)
             {
@@ -555,6 +549,12 @@ namespace Game.Spells
                 modifyCooldown.WithoutCategoryCooldown = withoutCategoryCooldown;
                 playerOwner.SendPacket(modifyCooldown);
             }
+
+            if (cooldownEntry.CooldownEnd <= now)
+            {                
+                _categoryCooldowns.Remove(cooldownEntry.CategoryId);
+                _spellCooldowns.Remove(cooldownEntry.SpellId);
+            }
         }
 
         public void ModifyCooldown(uint spellId, TimeSpan cooldownMod, bool withoutCategoryCooldown = false)