diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java
index f936297e5..9429ab2ef 100644
--- a/src/main/java/techreborn/tiles/TileQuantumTank.java
+++ b/src/main/java/techreborn/tiles/TileQuantumTank.java
@@ -81,7 +81,7 @@ public class TileQuantumTank extends TileMachineBase
 			FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType());
 			if (tank.getFluidType() != null && getStackInSlot(2) == null)
 			{
-				inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock()));
+//				inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock()));
 			} else if (tank.getFluidType() == null && getStackInSlot(2) != null)
 			{
 				setInventorySlotContents(2, null);
diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java
index eca3a9a01..6489f273c 100644
--- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java
+++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java
@@ -158,9 +158,9 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
 	public void updateEntity()
 	{
 		super.updateEntity();
-		FluidUtils.drainContainers(this, inventory, 0, 1);
 		if (!worldObj.isRemote)
 		{
+			FluidUtils.drainContainers(this, inventory, 0, 1);
 			for (EnumFacing direction : EnumFacing.values())
 			{
 				if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),