diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index 9d95ad0f0d..ef548d4334 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -556,7 +556,10 @@ public class ForgeHooks
             return null;
         }
 
-        player.getEntityWorld().spawnEntityInWorld(event.entityItem);
+        if (player.isServerWorld())
+        {
+            player.getEntityWorld().spawnEntityInWorld(event.entityItem);
+        }
         return event.entityItem;
     }