diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index 02b32cfa63..a17a537d69 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -34,7 +34,7 @@ public class CraftItem extends CraftEntity implements Item {
     }
 
     public void setPickupDelay(int delay) {
-        item.pickupDelay = delay;
+        item.pickupDelay = Math.min(delay, Short.MAX_VALUE);
     }
 
     @Override