diff --git a/paper-server/nms-patches/ItemSkull.patch b/paper-server/nms-patches/ItemSkull.patch
new file mode 100644
index 0000000000..2845d0f96a
--- /dev/null
+++ b/paper-server/nms-patches/ItemSkull.patch
@@ -0,0 +1,10 @@
+--- a/net/minecraft/server/ItemSkull.java
++++ b/net/minecraft/server/ItemSkull.java
+@@ -117,6 +117,7 @@
+             nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
+             return true;
+         } else {
++            nbttagcompound.remove("SkullOwner"); // CraftBukkit - remove broken skulls
+             return false;
+         }
+     }