diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
index 6a54f2a166..dff5bb5171 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
@@ -52,7 +52,8 @@ public class CraftChest extends CraftLootable<TileEntityChest> implements Chest
         int z = this.getZ();
         CraftWorld world = (CraftWorld) this.getWorld();
 
-        ITileInventory nms = ((BlockChest) Blocks.CHEST).getInventory(data, world.getHandle(), new BlockPosition(x, y, z), true);
+        BlockChest blockChest = (BlockChest) (this.getType() == Material.CHEST ? Blocks.CHEST : Blocks.TRAPPED_CHEST);
+        ITileInventory nms = blockChest.getInventory(data, world.getHandle(), new BlockPosition(x, y, z), true);
 
         if (nms instanceof InventoryLargeChest) {
             inventory = new CraftInventoryDoubleChest((InventoryLargeChest) nms);