diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index bd95f8cf9..d767125a2 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -27,41 +27,47 @@ void IUIScene_CreativeMenu::staticCtor()
 	vector< shared_ptr<ItemInstance> > *list;
 
 	// Other items
-	DEF(eCreativeInventory_Other)
-		ITEM(Tile::unbreakable_Id)            // Bedrock
+#ifdef _DEBUG
+	if (app.DebugSettingsOn())
+	{
+		DEF(eCreativeInventory_Other)
+			ITEM(Tile::unbreakable_Id)            // Bedrock
 
-		ITEM(Tile::water_Id)
-		ITEM(Tile::calmWater_Id)
-		ITEM(Tile::lava_Id)
-		ITEM(Tile::calmLava_Id)
+			ITEM(Tile::water_Id)
+			ITEM(Tile::calmWater_Id)
+			ITEM(Tile::lava_Id)
+			ITEM(Tile::calmLava_Id)
 
-		ITEM(Tile::pistonExtensionPiece_Id)
-		ITEM(Tile::pistonMovingPiece_Id)
+			ITEM(Tile::pistonExtensionPiece_Id)
+			ITEM(Tile::pistonMovingPiece_Id)
 
-		ITEM(Tile::fire_Id)
-		ITEM(Tile::mobSpawner_Id)
+			ITEM(Tile::fire_Id)
+			ITEM(Tile::mobSpawner_Id)
 
-		ITEM(Tile::furnace_lit_Id)
-		ITEM(Tile::wallSign_Id)
+			ITEM(Tile::furnace_lit_Id)
+			ITEM(Tile::wallSign_Id)
 
-		ITEM(Tile::redStoneOre_lit_Id)
-		ITEM(Tile::redstoneTorch_off_Id)
+			ITEM(Tile::redStoneOre_lit_Id)
+			ITEM(Tile::redstoneTorch_off_Id)
 
-		ITEM(Tile::portalTile_Id)
-		ITEM(Tile::endPortalTile_Id)
+			ITEM(Tile::portalTile_Id)
+			ITEM(Tile::endPortalTile_Id)
 
-		ITEM(Tile::diode_on_Id)
-		ITEM(Tile::comparator_on_Id)
+			ITEM(Tile::diode_on_Id)
+			ITEM(Tile::comparator_on_Id)
 
-		ITEM(Tile::tripWire_Id)
+			ITEM(Tile::tripWire_Id)
 
-		ITEM(Tile::pumpkinStem_Id)
-		ITEM(Tile::melonStem_Id)
-		ITEM(Tile::netherStalk_Id)
-		ITEM(Tile::cocoa_Id)
+			ITEM(Tile::pumpkinStem_Id)
+			ITEM(Tile::melonStem_Id)
+			ITEM(Tile::netherStalk_Id)
+			ITEM(Tile::cocoa_Id)
 
-		ITEM(Tile::dragonEgg_Id)
-		ITEM(Tile::commandBlock_Id)
+			ITEM(Tile::dragonEgg_Id)
+			ITEM(Tile::commandBlock_Id)
+
+	}
+#endif
 
 	// Building Blocks
 	DEF(eCreativeInventory_BuildingBlocks)
@@ -785,12 +791,15 @@ void IUIScene_CreativeMenu::staticCtor()
 	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup);
 #endif
 
+#ifdef _DEBUG
 	ECreative_Inventory_Groups otherGroup[] = { eCreativeInventory_Other };
 
 	specs[eCreativeInventoryTab_Other] =
 		new TabSpec(L"Other", IDS_GROUPNAME_MISCELLANEOUS, 1, otherGroup);
+#endif
 }
 
+
 IUIScene_CreativeMenu::IUIScene_CreativeMenu()
 {
 	m_bCarryingCreativeItem = false;
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
index fe4c4416a..a7deedad5 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
@@ -19,7 +19,9 @@ public:
 		eCreativeInventoryTab_ToolsWeaponsArmor,
 		eCreativeInventoryTab_Brewing,
 		eCreativeInventoryTab_Misc,
+#ifdef DEBUG
 		eCreativeInventoryTab_Other,
+#endif
 		eCreativeInventoryTab_COUNT,
 	};
 
@@ -41,7 +43,9 @@ public:
 		eCreativeInventory_Misc,
 		eCreativeInventory_ArtToolsDecorations,
 		eCreativeInventory_ArtToolsMisc,
+#ifdef DEBUG
 		eCreativeInventory_Other,
+#endif
 		eCreativeInventoryGroupsCount
 	};