diff --git a/paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch
index da106bbd37..1ea1ce3ee1 100644
--- a/paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch
+++ b/paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch
@@ -307,7 +307,7 @@
                  if (j >= this.getMaxDamage()) {
                      Item item = this.getItem();
 +                    // CraftBukkit start - Check for item breaking
-+                    if (this.count == 1) {
++                    if (this.count == 1 && entityplayer != null) {
 +                        org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(entityplayer, this);
 +                    }
 +                    // CraftBukkit end