diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 86b6ad1c63..831ad7ed40 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -1458,6 +1458,12 @@ public class NetServerHandler extends NetHandler {
         ItemStack itemstack;
         ItemStack itemstack1;
 
+        // CraftBukkit start - ignore empty payloads
+        if (packet250custompayload.length <= 0) {
+            return;
+        }
+        // CraftBukkit end
+
         if ("MC|BEdit".equals(packet250custompayload.tag)) {
             try {
                 datainputstream = new DataInputStream(new ByteArrayInputStream(packet250custompayload.data));