diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
index d2497bbf1..f2c3b0ac4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
@@ -159,16 +159,19 @@ public abstract class BlockContainerBase extends BlockContainer{
 
             if(tile instanceof IEnergySaver){
                 ((IEnergySaver)tile).setEnergy(stack.getTagCompound().getInteger("Energy"));
+                stack.getTagCompound().removeTag("Energy");
             }
 
             if(tile instanceof IFluidSaver){
                 int amount = stack.getTagCompound().getInteger("FluidAmount");
+                stack.getTagCompound().removeTag("FluidAmount");
 
                 if(amount > 0){
                     FluidStack[] fluids = new FluidStack[amount];
 
                     for(int i = 0; i < amount; i++){
                         NBTTagCompound compound = stack.getTagCompound().getCompoundTag("Fluid"+i);
+                        stack.getTagCompound().removeTag("Fluid"+i);
                         if(compound != null){
                             fluids[i] = FluidStack.loadFluidStackFromNBT(compound);
                         }