diff --git a/Content.Server/White/Other/OnDeath.cs b/Content.Server/White/Other/OnDeath.cs
index 0c41a10a21..c683dbf1d5 100644
--- a/Content.Server/White/Other/OnDeath.cs
+++ b/Content.Server/White/Other/OnDeath.cs
@@ -64,8 +64,8 @@ public sealed class OnDeath : EntitySystem
         }
 
         var newStream = _audio.PlayEntity(HeartSounds, uid, uid, AudioParams.Default.WithLoop(true));
-        _playingStreams[uid] = newStream.Value.Entity;
-
+        if (newStream.HasValue)
+            _playingStreams[uid] = newStream.Value.Entity;
     }
 
     private void StopPlayingStream(EntityUid uid)