diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/tile/TileSink.java b/src/main/java/net/blay09/mods/cookingforblockheads/tile/TileSink.java
index 1b9179c7..5c71b251 100644
--- a/src/main/java/net/blay09/mods/cookingforblockheads/tile/TileSink.java
+++ b/src/main/java/net/blay09/mods/cookingforblockheads/tile/TileSink.java
@@ -161,6 +161,7 @@ public int getWaterAmount() {
 
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
+        // fluid type filtering is already done in the water tank fill method.
         int result = waterTank.fill(resource, doFill);
         worldObj.addBlockEvent(xCoord, yCoord, zCoord, CookingForBlockheads.blockSink, 1, waterTank.getFluidAmount());
         return result;
@@ -168,6 +169,9 @@ public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
 
     @Override
     public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
+        if (!canDrain(from, resource.getFluid())) {
+            return null;
+        }
         return drain(from, resource.amount, doDrain);
     }