diff --git a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java
index 93590ba779..3fb858c04d 100644
--- a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java
+++ b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java
@@ -57,7 +57,8 @@ public class RenderBlockFluid implements ISimpleBlockRenderingHandler
     {
         if (world.getBlock(x, y, z) == block)
         {
-            if (world.getBlock(x, y - block.densityDir, z).getMaterial().isLiquid())
+            Block verticalOrigin = world.getBlock(x, y - block.densityDir, z);
+            if (verticalOrigin.getMaterial().isLiquid() || verticalOrigin instanceof IFluidBlock)
             {
                 return 1;
             }