diff --git a/environmentex/src/main/java/de/hessj/environmentex/InfinityWaterBucket.java b/environmentex/src/main/java/de/hessj/environmentex/InfinityWaterBucket.java
index ddba20f..8bd4e1b 100755
--- a/environmentex/src/main/java/de/hessj/environmentex/InfinityWaterBucket.java
+++ b/environmentex/src/main/java/de/hessj/environmentex/InfinityWaterBucket.java
@@ -130,7 +130,10 @@ public class InfinityWaterBucket implements Listener {
                 targetBlock.setType(Material.WATER); // refresh water
             }
         } else {
-            targetBlock.setType(Material.WATER);
+            // Only place water if the target block is replaceable or air
+            if (targetBlock.isEmpty() || targetBlock.isPassable()) {
+                targetBlock.setType(Material.WATER);
+            }
         }
     }
 }
\ No newline at end of file