diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java
index 25531875b..2818b3a6f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankRenderer.java
@@ -68,4 +68,9 @@ public class FluidTankRenderer extends SafeTileEntityRenderer<FluidTankTileEntit
 		ms.pop();
 	}
 
+	@Override
+	public boolean isGlobalRenderer(FluidTankTileEntity te) {
+		return te.isController();
+	}
+
 }
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
index bfe3857c4..aa487a29b 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
@@ -284,7 +284,16 @@ public class FluidTankTileEntity extends SmartTileEntity {
 	@Override
 	@OnlyIn(Dist.CLIENT)
 	public AxisAlignedBB getRenderBoundingBox() {
-		return super.getRenderBoundingBox().expand(width - 1, height - 1, width - 1);
+		if (isController())
+			return super.getRenderBoundingBox().expand(width - 1, height - 1, width - 1);
+		return super.getRenderBoundingBox();
+	}
+
+	@Override
+	@OnlyIn(Dist.CLIENT)
+	public double getMaxRenderDistanceSquared() {
+		int dist = 64 + getMaxHeight() * 2;
+		return dist * dist;
 	}
 
 	@Nullable