diff --git a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidTank.java b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidTank.java
index 56405abf0..377a4f9da 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidTank.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidTank.java
@@ -190,7 +190,7 @@ public class FluidTank implements IFluidHandler, IFluidTank {
             drained = fluid.getAmount();
         }
         FluidStack stack = new FluidStack(fluid, drained);
-        if (action.execute())
+        if (action.execute() && drained > 0)
         {
             fluid.shrink(drained);
         }