diff --git a/Source/Game/Spells/SpellHistory.cs b/Source/Game/Spells/SpellHistory.cs
index 9ec4a1cec..24d720cb6 100644
--- a/Source/Game/Spells/SpellHistory.cs
+++ b/Source/Game/Spells/SpellHistory.cs
@@ -735,6 +735,9 @@ namespace Game.Spells
 
                     player.SendPacket(setSpellCharges);
                 }
+
+                if (chargeList.Empty())
+                    _categoryCharges.Remove(chargeCategoryId);
             }
         }
 
@@ -963,11 +966,6 @@ namespace Game.Spells
                 RechargeStart = startTime;
                 RechargeEnd = startTime + rechargeTime;
             }
-            public ChargeEntry(DateTime startTime, DateTime endTime)
-            {
-                RechargeStart = startTime;
-                RechargeEnd = endTime;
-            }
 
             public DateTime RechargeStart;
             public DateTime RechargeEnd;