diff --git a/Content.Server/Nutrition/Components/HungerComponent.cs b/Content.Server/Nutrition/Components/HungerComponent.cs
index 8a9a17d093..05495e6669 100644
--- a/Content.Server/Nutrition/Components/HungerComponent.cs
+++ b/Content.Server/Nutrition/Components/HungerComponent.cs
@@ -64,6 +64,7 @@ namespace Content.Server.Nutrition.Components
             { HungerThreshold.Overfed, AlertType.Overfed },
             { HungerThreshold.Peckish, AlertType.Peckish },
             { HungerThreshold.Starving, AlertType.Starving },
+            { HungerThreshold.Dead, AlertType.Starving },
         };
 
         public void HungerThresholdEffect(bool force = false)
diff --git a/Content.Server/Nutrition/Components/ThirstComponent.cs b/Content.Server/Nutrition/Components/ThirstComponent.cs
index 04e8af2147..5a2f435f68 100644
--- a/Content.Server/Nutrition/Components/ThirstComponent.cs
+++ b/Content.Server/Nutrition/Components/ThirstComponent.cs
@@ -48,6 +48,7 @@ namespace Content.Server.Nutrition.Components
             {ThirstThreshold.OverHydrated, AlertType.Overhydrated},
             {ThirstThreshold.Thirsty, AlertType.Thirsty},
             {ThirstThreshold.Parched, AlertType.Parched},
+            {ThirstThreshold.Dead, AlertType.Parched},
         };
     }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
index 03db94acd2..2bafa46510 100644
--- a/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
@@ -44,7 +44,7 @@ namespace Content.Server.Nutrition.EntitySystems
 
         private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args)
         {
-            var mod = (component.CurrentThirstThreshold & (ThirstThreshold.Parched | ThirstThreshold.Dead)) != 0x0 ? 0.75f : 1.0f;
+            var mod = component.CurrentThirstThreshold <= ThirstThreshold.Parched ? 0.75f : 1.0f;
             args.ModifySpeed(mod, mod);
         }
 
diff --git a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
index 12499e463a..88f1a00af5 100644
--- a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
@@ -24,10 +24,10 @@ namespace Content.Shared.Nutrition.Components
     [Serializable, NetSerializable]
     public enum HungerThreshold : byte
     {
-        Overfed,
-        Okay,
-        Peckish,
-        Starving,
-        Dead,
+        Overfed = 1 << 3,
+        Okay = 1 << 2,
+        Peckish = 1 << 1,
+        Starving = 1 << 0,
+        Dead = 0,
     }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedHungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedHungerSystem.cs
index 0d6c5b17d3..0e15a6a095 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedHungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedHungerSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Movement.Systems;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Nutrition.Components;
 
 namespace Content.Shared.Nutrition.EntitySystems
@@ -14,7 +14,7 @@ namespace Content.Shared.Nutrition.EntitySystems
 
         private void OnRefreshMovespeed(EntityUid uid, SharedHungerComponent component, RefreshMovementSpeedModifiersEvent args)
         {
-            float mod = component.CurrentHungerThreshold == HungerThreshold.Starving ? 0.75f : 1.0f;
+            float mod = component.CurrentHungerThreshold <= HungerThreshold.Starving ? 0.75f : 1.0f;
             args.ModifySpeed(mod, mod);
         }
     }