diff --git a/Content.Server/Stories/Nightvision/NightvisionSystem.cs b/Content.Server/Stories/Nightvision/NightvisionSystem.cs
index d5e5d9db9f..3d91097982 100644
--- a/Content.Server/Stories/Nightvision/NightvisionSystem.cs
+++ b/Content.Server/Stories/Nightvision/NightvisionSystem.cs
@@ -17,14 +17,15 @@ public override void Initialize()
     }
     private void OnUnequipped(EntityUid uid, NightvisionClothingComponent component, GotUnequippedEvent args)
     {
-        RemCompDeferred<NightvisionComponent>(args.Equipee);
+        if (args.Slot == "eyes")
+            RemCompDeferred<NightvisionComponent>(args.Equipee);
     }
     private void OnEquipped(EntityUid uid, NightvisionClothingComponent component, GotEquippedEvent args)
     {
         if (_gameTiming.ApplyingState)
             return;
 
-        if (component.Enabled && !HasComp<NightvisionComponent>(args.Equipee))
+        if (component.Enabled && !HasComp<NightvisionComponent>(args.Equipee) && (args.Slot == "eyes"))
             AddComp<NightvisionComponent>(args.Equipee);
     }
 }