diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index dde94253043..5f43e730ad4 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -155,7 +155,7 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup
 
     private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
     {
-        _alerts.ClearAlert(uid, AlertType.Mana);
+        _alerts.ClearAlert(uid, component.ManaAlert);
 
         if (!HasComp<NpcFactionMemberComponent>(uid))
             return;
@@ -166,7 +166,7 @@ private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove
     public void UpdateManaAlert(EntityUid uid, PsionicComponent component)
     {
         var severity = (short) ContentHelpers.RoundToLevels(component.Mana, component.MaxMana, 8);
-        _alerts.ShowAlert(uid, AlertType.Mana, severity);
+        _alerts.ShowAlert(uid, component.ManaAlert, severity);
     }
 
     private void OnManaUpdate(EntityUid uid, PsionicComponent component, ref OnManaUpdateEvent args)