diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
index 37a14a792..1ed313c5e 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.container;
 
-import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.container.slot.*;
 import com.raoulvdberge.refinedstorage.tile.TileBase;
@@ -78,10 +77,6 @@ public abstract class ContainerBase extends Container {
         }
 
         if (slot instanceof SlotFilter) {
-            if (slot.getStack().getItem() == RSItems.FILTER) {
-                return super.slotClick(id, dragType, clickType, player);
-            }
-
             if (((SlotFilter) slot).allowsSize()) {
                 if (clickType == ClickType.QUICK_MOVE) {
                     slot.putStack(ItemStack.EMPTY);
@@ -101,10 +96,6 @@ public abstract class ContainerBase extends Container {
             } else if (player.inventory.getItemStack().isEmpty()) {
                 slot.putStack(ItemStack.EMPTY);
             } else if (slot.isItemValid(player.inventory.getItemStack())) {
-                if (player.inventory.getItemStack().getItem() == RSItems.FILTER) {
-                    return super.slotClick(id, dragType, clickType, player);
-                }
-
                 slot.putStack(player.inventory.getItemStack().copy());
             }
 
@@ -143,10 +134,6 @@ public abstract class ContainerBase extends Container {
                 slot.putStack(ItemHandlerHelper.copyStackWithSize(stack, 1));
                 slot.onSlotChanged();
 
-                if (stack.getItem() == RSItems.FILTER) {
-                    stack.setCount(0);
-                }
-
                 return ItemStack.EMPTY;
             }
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilter.java
index bad21d7e4..89ccda0a7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilter.java
@@ -1,8 +1,6 @@
 package com.raoulvdberge.refinedstorage.container.slot;
 
-import com.raoulvdberge.refinedstorage.RSItems;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.*;
 import net.minecraft.util.math.BlockPos;
@@ -30,11 +28,6 @@ public class SlotFilter extends SlotItemHandler {
         this(handler, id, x, y, 0);
     }
 
-    @Override
-    public boolean canTakeStack(EntityPlayer player) {
-        return getStack().getItem() == RSItems.FILTER;
-    }
-
     @Override
     public boolean isItemValid(@Nonnull ItemStack stack) {
         if (super.isItemValid(stack)) {