diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
index 9ef1f0d5e4..f1fbf0576f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
@@ -287,6 +287,10 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
                 case BLACK_SHULKER_BOX:
                     blockEntityTag.setString("id", "shulker_box");
                     break;
+                case BEE_NEST:
+                case BEEHIVE:
+                    blockEntityTag.setString("id", "beehive");
+                    break;
             }
         }
         TileEntity te = (blockEntityTag == null) ? null : TileEntity.create(blockEntityTag);