diff --git a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
index b3a7e1691a..4fb50d12f2 100644
--- a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
+++ b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
@@ -148,14 +148,15 @@ public abstract class FluidRegistry
     {
         if (fluidBlocks == null)
         {
-            fluidBlocks = HashBiMap.create();
+            BiMap<Block, Fluid> tmp = HashBiMap.create();
             for (Fluid fluid : fluids.values())
             {
                 if (fluid.canBePlacedInWorld() && fluid.getBlock() != null)
                 {
-                    fluidBlocks.put(fluid.getBlock(), fluid);
+                    tmp.put(fluid.getBlock(), fluid);
                 }
             }
+            fluidBlocks = tmp;
         }
         return fluidBlocks.get(block);
     }