diff --git a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java
index 7a2281cad..2c75bc699 100644
--- a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java
+++ b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java
@@ -85,12 +85,15 @@ public class UniversalBucket extends Item implements IFluidContainerItem
     {
         for (Fluid fluid : FluidRegistry.getRegisteredFluids().values())
         {
-            // add all fluids that the bucket can be filled  with
-            FluidStack fs = new FluidStack(fluid, getCapacity());
-            ItemStack stack = new ItemStack(this);
-            if (fill(stack, fs, true) == fs.amount)
+            if (fluid != FluidRegistry.WATER && fluid != FluidRegistry.LAVA && !fluid.getName().equals("milk"))
             {
-                subItems.add(stack);
+                // add all fluids that the bucket can be filled  with
+                FluidStack fs = new FluidStack(fluid, getCapacity());
+                ItemStack stack = new ItemStack(this);
+                if (fill(stack, fs, true) == fs.amount)
+                {
+                    subItems.add(stack);
+                }
             }
         }
     }