diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
index 917d3d30f4..21fb3d0970 100644
--- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
@@ -89,11 +89,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
 
             if (entities.Count != 0)
             {
-                SoundSystem.Play(Filter.Pvs(Owner), _hitSound, entities.First());
+                SoundSystem.Play(Filter.Pvs(Owner), _hitSound, entities.First().Transform.Coordinates);
             }
             else
             {
-                SoundSystem.Play(Filter.Pvs(Owner), _missSound, eventArgs.User);
+                SoundSystem.Play(Filter.Pvs(Owner), _missSound, eventArgs.User.Transform.Coordinates);
             }
 
             var hitEntities = new List<IEntity>();
diff --git a/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs
index 71d5167875..ad7bdaeb79 100644
--- a/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MeleeWeaponSystem.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using Content.Shared.GameObjects.EntitySystemMessages;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
+using Robust.Shared.Player;
 
 namespace Content.Server.GameObjects.EntitySystems
 {
@@ -11,12 +12,12 @@ namespace Content.Server.GameObjects.EntitySystems
         public void SendAnimation(string arc, Angle angle, IEntity attacker, IEntity source, IEnumerable<IEntity> hits, bool textureEffect = false, bool arcFollowAttacker = true)
         {
             RaiseNetworkEvent(new MeleeWeaponSystemMessages.PlayMeleeWeaponAnimationMessage(arc, angle, attacker.Uid, source.Uid,
-                hits.Select(e => e.Uid).ToList(), textureEffect, arcFollowAttacker));
+                hits.Select(e => e.Uid).ToList(), textureEffect, arcFollowAttacker), Filter.Pvs(source, 1f));
         }
 
         public void SendLunge(Angle angle, IEntity source)
         {
-            RaiseNetworkEvent(new MeleeWeaponSystemMessages.PlayLungeAnimationMessage(angle, source.Uid));
+            RaiseNetworkEvent(new MeleeWeaponSystemMessages.PlayLungeAnimationMessage(angle, source.Uid), Filter.Pvs(source, 1f));
         }
     }
 }