diff --git a/src/main/java/com/progwml6/ironchest/common/items/ChestChangerItem.java b/src/main/java/com/progwml6/ironchest/common/items/ChestChangerItem.java
index 438dce8..19712cb 100644
--- a/src/main/java/com/progwml6/ironchest/common/items/ChestChangerItem.java
+++ b/src/main/java/com/progwml6/ironchest/common/items/ChestChangerItem.java
@@ -66,6 +66,15 @@ public class ChestChangerItem extends TooltipItem
         }
 
         TileEntity tileEntity = world.getTileEntity(blockPos);
+
+        if (this.type.canUpgrade(ChestType.WOOD))
+        {
+            if (!(tileEntity instanceof ChestTileEntity))
+            {
+                return ActionResultType.PASS;
+            }
+        }
+
         IronChestTileEntity newChest = new IronChestTileEntity();
 
         ITextComponent customName = null;