diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/helper/FluidHelper.java b/src/main/java/thedarkcolour/exdeorum/blockentity/helper/FluidHelper.java
index 7462e08d..b2b4e105 100644
--- a/src/main/java/thedarkcolour/exdeorum/blockentity/helper/FluidHelper.java
+++ b/src/main/java/thedarkcolour/exdeorum/blockentity/helper/FluidHelper.java
@@ -30,7 +30,9 @@ public class FluidHelper extends FluidTank {
     @Override
     public FluidTank readFromNBT(CompoundTag nbt) {
         super.readFromNBT(nbt);
-        this.fluid.setAmount(Math.min(this.capacity, this.fluid.getAmount()));
+        if (!this.fluid.isEmpty()) {
+            this.fluid.setAmount(Math.min(this.capacity, this.fluid.getAmount()));
+        }
 
         return this;
     }