diff --git a/src/main/java/net/minecraftforge/fluids/FluidTank.java b/src/main/java/net/minecraftforge/fluids/FluidTank.java
index d6e5a5a8d..cd0e6bd5a 100644
--- a/src/main/java/net/minecraftforge/fluids/FluidTank.java
+++ b/src/main/java/net/minecraftforge/fluids/FluidTank.java
@@ -37,11 +37,11 @@ public class FluidTank implements IFluidTank
         if (!nbt.hasKey("Empty"))
         {
             FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt);
-
-            if (fluid != null)
-            {
-                setFluid(fluid);
-            }
+            setFluid(fluid);
+        }
+        else
+        {
+            setFluid(null);
         }
         return this;
     }