diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index d16769ed5f..1d896aa9c9 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -102,7 +102,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee } var audioSystem = _entitySystemManager.GetEntitySystem(); - audioSystem.Play(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg"); + var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0]; + audioSystem.Play(hitEntities.Count > 0 ? _hitSound : "/Audio/weapons/punchmiss.ogg", emitter); if (Arc != null) {