diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index 9ae7f7f358..aecf24587f 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -26,6 +26,10 @@ public abstract class EntityAgeable extends EntityCreature {
                     // CraftBukkit start
                     if (!entityhuman.abilities.canInstantlyBuild) {
                         itemstack.count--;
+
+                        if (itemstack.count == 0) {
+                            entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, null);
+                        }
                     }
                     // CraftBukkit end
                 }