diff --git a/Content.Server/Sound/BaseEmitSoundComponent.cs b/Content.Server/Sound/BaseEmitSoundComponent.cs
index a1a4df3a56..6b0535a384 100644
--- a/Content.Server/Sound/BaseEmitSoundComponent.cs
+++ b/Content.Server/Sound/BaseEmitSoundComponent.cs
@@ -6,10 +6,12 @@ namespace Content.Server.Sound
 {
     /// <summary>
     /// Base sound emitter which defines most of the data fields.
+    /// Default behavior first try to play the sound collection,
+    /// and if one isn't assigned, then it will try to play the single sound.
     /// </summary>
     public abstract class BaseEmitSoundComponent : Component
     {
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("variation")] public float PitchVariation { get; set; } = 0.0f;
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("soundCollection", required: true)] public string SoundCollectionName { get; set; } = default!;
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("variation")] public float PitchVariation { get; set; }
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("soundCollection")] public string? SoundCollectionName { get; set; }
     }
 }
diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs
index 3459522a3e..b10bbe74da 100644
--- a/Content.Server/Sound/EmitSoundSystem.cs
+++ b/Content.Server/Sound/EmitSoundSystem.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using Content.Shared.Audio;
 using Content.Shared.Interaction;
 using Content.Shared.Throwing;
@@ -10,6 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Robust.Shared.Log;
 
 namespace Content.Server.Sound
 {
@@ -31,7 +33,14 @@ namespace Content.Server.Sound
 
         private void PlaySound(BaseEmitSoundComponent component)
         {
-            PlayRandomSoundFromCollection(component);
+            if (!string.IsNullOrWhiteSpace(component.SoundCollectionName))
+            {
+                PlayRandomSoundFromCollection(component);
+            }
+            else
+            {
+                Logger.Warning($"{nameof(component)}: {component.Owner} has no {nameof(component.SoundCollectionName)} to play.");
+            }
         }
 
         private void PlayRandomSoundFromCollection(BaseEmitSoundComponent component)
@@ -48,8 +57,16 @@ namespace Content.Server.Sound
 
         private static void PlaySingleSound(string soundName, BaseEmitSoundComponent component)
         {
-            SoundSystem.Play(Filter.Pvs(component.Owner), soundName, component.Owner,
-                             AudioHelpers.WithVariation(component.PitchVariation).WithVolume(-2f));
+            if (component.PitchVariation > 0.0)
+            {
+                SoundSystem.Play(Filter.Pvs(component.Owner), soundName, component.Owner,
+                                 AudioHelpers.WithVariation(component.PitchVariation).WithVolume(-2f));
+            }
+            else
+            {
+                SoundSystem.Play(Filter.Pvs(component.Owner), soundName, component.Owner,
+                                 AudioParams.Default.WithVolume(-2f));
+            }
         }
     }
 }