diff --git a/common/mekanism/common/CommonPlayerTickHandler.java b/common/mekanism/common/CommonPlayerTickHandler.java
index 611c130bd..210a9dc3a 100644
--- a/common/mekanism/common/CommonPlayerTickHandler.java
+++ b/common/mekanism/common/CommonPlayerTickHandler.java
@@ -156,7 +156,7 @@ public class CommonPlayerTickHandler implements ITickHandler
 	{
 		ItemStack stack = player.inventory.armorInventory[2];
 
-		if(stack != null)
+		if(stack != null && !player.capabilities.isCreativeMode)
 		{
 			if(stack.getItem() instanceof ItemJetpack)
 			{
diff --git a/common/mekanism/common/item/ItemAtomicDisassembler.java b/common/mekanism/common/item/ItemAtomicDisassembler.java
index 200b29708..d3a9ce278 100644
--- a/common/mekanism/common/item/ItemAtomicDisassembler.java
+++ b/common/mekanism/common/item/ItemAtomicDisassembler.java
@@ -201,7 +201,7 @@ public class ItemAtomicDisassembler extends ItemEnergized
 
 	private boolean useHoe(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side)
 	{
-		if(!player.canPlayerEdit(x, y, z, side, stack) || getEnergy(stack) < HOE_USAGE)
+		if(!player.canPlayerEdit(x, y, z, side, stack) || (!player.capabilities.isCreativeMode && getEnergy(stack) < HOE_USAGE))
 		{
 			return false;
 		}
@@ -233,7 +233,12 @@ public class ItemAtomicDisassembler extends ItemEnergized
 				}
 				else {
 					world.setBlock(x, y, z, block.blockID);
-					setEnergy(stack, getEnergy(stack)-HOE_USAGE);
+					
+					if(!player.capabilities.isCreativeMode)
+					{
+						setEnergy(stack, getEnergy(stack)-HOE_USAGE);
+					}
+					
 					return true;
 				}
 			}