diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs
index 2172bc900..95893d27c 100644
--- a/Source/Game/Entities/Player/Player.Spells.cs
+++ b/Source/Game/Entities/Player/Player.Spells.cs
@@ -2199,6 +2199,7 @@ namespace Game.Entities
 
             bool cur_active = pSpell.Active;
             bool cur_dependent = pSpell.Dependent;
+            int? traitDefinitionId = pSpell.TraitDefinitionId;
 
             if (disabled)
             {
@@ -2315,6 +2316,13 @@ namespace Game.Entities
                 }
             }
 
+            if (traitDefinitionId.HasValue)
+            {
+                var traitDefinition = CliDB.TraitDefinitionStorage.LookupByKey(traitDefinitionId.Value);
+                if (traitDefinition != null)
+                    RemoveOverrideSpell(traitDefinition.OverridesSpellID, spellId);
+            }
+
             m_overrideSpells.Remove(spellId);
 
             if (m_canTitanGrip)