diff --git a/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java b/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java
index 592b6ba469..5cf262c531 100644
--- a/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java
+++ b/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java
@@ -51,7 +51,7 @@ public FluidStack copy(FluidStack fluidStack) {
 
     @Override
     public FluidStack getFluid(@Nullable ResourceHandler<FluidResource> fluidHandler) {
-        return fluidHandler != null ? FluidUtil.getStack(fluidHandler, 0) : FluidStack.EMPTY;
+        return fluidHandler != null && fluidHandler.size() > 0 ? FluidUtil.getStack(fluidHandler, 0) : FluidStack.EMPTY;
     }
 
     @Override