diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java
index 344e57610..dcda26ead 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java
@@ -74,7 +74,7 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
 			(p, d) -> infinityCheckFrontier.add(new BlockPosEntry(p, d)), true);
 		int maxBlocks = maxBlocks();
 
-		if (infinityCheckVisited.size() > maxBlocks && maxBlocks != -1) {
+		if (infinityCheckVisited.size() > maxBlocks && maxBlocks != -1 && !fillInfinite()) {
 			if (!infinite) {
 				reset();
 				infinite = true;
@@ -165,9 +165,11 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
 
 			if (visited.size() >= maxBlocks && maxBlocks != -1) {
 				infinite = true;
-				visited.clear();
-				queue.clear();
-				return false;
+				if (!fillInfinite()) {
+					visited.clear();
+					queue.clear();
+					return false;
+				}
 			}
 
 			SpaceType spaceType = getAtPos(world, currentPos, fluid);