diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
index 6fe0a343b..52821421a 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
@@ -130,12 +130,12 @@ public class FluidPump extends SimpleSlimefunItem<BlockTicker> implements Invent
     }
 
     private void consumeFluid(Block fluid) {
-        if (fluid.getType() == Material.WATER) {
+        if (fluid.getType() == Material.STATIONARY_WATER) {
             fluid.setType(Material.AIR);
             return;
         }
 
-        List<Block> list = Vein.find(fluid, RANGE, block -> block.isLiquid() && block.getType() == fluid.getType());
+        List<Block> list = Vein.find(fluid, RANGE, block -> isLiquid(block) && block.getType() == fluid.getType());
         list.get(list.size() - 1).setType(Material.AIR);
     }
 
@@ -149,6 +149,14 @@ public class FluidPump extends SimpleSlimefunItem<BlockTicker> implements Invent
 
         return Optional.empty();
     }
+    
+    private boolean isLiquid(Block block) {
+        BlockData data = block.getBlockData();
+        if (data instanceof Levelled) {
+            return ((Levelled) data).getLevel == 0;
+        }
+        return false;
+    }
 
     @Override
     public BlockTicker getItemHandler() {