diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
index d01be1e191..df502e8839 100644
--- a/src/main/java/net/minecraft/server/PlayerInventory.java
+++ b/src/main/java/net/minecraft/server/PlayerInventory.java
@@ -439,6 +439,11 @@ public class PlayerInventory implements IInventory {
     }
 
     public ItemStack getCarried() {
+        // CraftBukkit start
+        if (this.f != null && this.f.count == 0) {
+            this.setCarried(null);
+        }
+        // CraftBukkit end
         return this.f;
     }