diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/EntityShowMode.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/EntityShowMode.java
index b95b4585..90d35b4f 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/EntityShowMode.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/show/EntityShowMode.java
@@ -92,11 +92,14 @@ public class EntityShowMode implements ShowMode<TNTPosition> {
             return;
         }
 
+        boolean exploded = position.getRecord().getPositions().stream().anyMatch(TNTPosition::isExploded);
+        boolean hideWater = !showModeParameter.isWater() && exploded && checkWater(position.getLocation());
+
         if (showModeParameter.isExplodeOnly()) {
             if (position.isExploded()) {
                 generatePositions(position, false, false);
             }
-            if (!showModeParameter.isSourceOnly()) {
+            if (!showModeParameter.isSourceOnly() && !hideWater) {
                 return;
             }
         }
@@ -105,11 +108,13 @@ public class EntityShowMode implements ShowMode<TNTPosition> {
             if (position.isSource()) {
                 generatePositions(position, false, false);
             }
-            return;
+            if (!hideWater) {
+                return;
+            }
         }
 
-        boolean exploded = position.getRecord().getPositions().stream().anyMatch(TNTPosition::isExploded);
-        if (!showModeParameter.isWater() && exploded && checkWater(position.getLocation())) {
+
+        if (hideWater) {
             if (position.isExploded()) {
                 for (TNTPosition pos : position.getRecord().getPositions()) {
                     generatePositions(pos, showModeParameter.isInterpolateY(), showModeParameter.isInterpolateXZ(), (positionType, vector) -> {