diff --git a/nms-patches/ItemSkull.patch b/nms-patches/ItemSkull.patch
index 81de415384..c97743dabe 100644
--- a/nms-patches/ItemSkull.patch
+++ b/nms-patches/ItemSkull.patch
@@ -1,22 +1,17 @@
 --- a/net/minecraft/server/ItemSkull.java
 +++ b/net/minecraft/server/ItemSkull.java
-@@ -117,6 +117,20 @@
+@@ -117,6 +117,15 @@
              nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile));
              return true;
          } else {
 +            // CraftBukkit start
-+            boolean valid = true;
-+
 +            NBTTagList textures = nbttagcompound.getCompound("SkullOwner").getCompound("Properties").getList("textures", 10); // Safe due to method contracts
 +            for (int i = 0; i < textures.size(); i++) {
-+                if (textures.get(i) instanceof NBTTagCompound && !((NBTTagCompound) textures.get(i)).hasKeyOfType("Signature", 8)) {
-+                    valid = false;
++                if (textures.get(i) instanceof NBTTagCompound && !((NBTTagCompound) textures.get(i)).hasKeyOfType("Signature", 8) && ((NBTTagCompound) textures.get(i)).getString("Value").trim().isEmpty()) {
++                    nbttagcompound.remove("SkullOwner");
++                    break;
 +                }
 +            }
-+
-+            if (!valid) {
-+                nbttagcompound.remove("SkullOwner");
-+            }
 +            // CraftBukkit end
              return false;
          }