diff --git a/Content.Server/_White/Headcrab/HeadcrabSystem.cs b/Content.Server/_White/Headcrab/HeadcrabSystem.cs
index 16bbc070cc..178266ddbf 100644
--- a/Content.Server/_White/Headcrab/HeadcrabSystem.cs
+++ b/Content.Server/_White/Headcrab/HeadcrabSystem.cs
@@ -104,10 +104,9 @@ private void OnGotEquipped(EntityUid uid, HeadcrabComponent component, GotEquipp
     private void OnUnequipAttempt(EntityUid uid, HeadcrabComponent component, BeingUnequippedAttemptEvent args)
     {
         if (args.Slot != "mask")
-            return;
-        if (component.EquippedOn != args.Unequipee)
-            return;
-        if (HasComp<ZombieComponent>(args.Unequipee))
+            || component.EquippedOn != args.Unequipee)
+            || HasComp<ZombieComponent>(args.Unequipee)
+            || _mobState.IsDead(uid))
             return;
         _popup.PopupEntity(Loc.GetString("headcrab-try-unequip"),
             args.Unequipee, args.Unequipee, PopupType.Large);