diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1df2579ede..b89f91700b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -310,6 +310,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         getHandle().playerConnection.sendPacket(packet);
     }
 
+    @Override
+    public void stopSound(Sound sound) {
+        stopSound(CraftSound.getSound(sound));
+    }
+
+    @Override
+    public void stopSound(String sound) {
+        if (getHandle().playerConnection == null) return;
+        PacketDataSerializer packetdataserializer = new PacketDataSerializer(Unpooled.buffer());
+
+        packetdataserializer.a(sound);
+        packetdataserializer.a("");
+        getHandle().playerConnection.sendPacket(new PacketPlayOutCustomPayload("MC|StopSound", packetdataserializer));
+    }
+
     @Override
     public void playEffect(Location loc, Effect effect, int data) {
         if (getHandle().playerConnection == null) return;