diff --git a/Source/Game/Maps/GridMap.cs b/Source/Game/Maps/GridMap.cs
index 4b9e0acbf..479c78265 100644
--- a/Source/Game/Maps/GridMap.cs
+++ b/Source/Game/Maps/GridMap.cs
@@ -602,9 +602,9 @@ namespace Game.Maps
 
             if (delta > collisionHeight)                   // Under water
                 status = ZLiquidStatus.UnderWater;
-            if (delta > 0.0f)                   // In water
+            else if (delta > 0.0f)                   // In water
                 status = ZLiquidStatus.InWater;
-            if (delta > -0.1f)                   // Walk on water
+            else if (delta > -0.1f)                   // Walk on water
                 status = ZLiquidStatus.WaterWalk;
 
             if (status != ZLiquidStatus.AboveWater)
diff --git a/Source/Game/Maps/TerrainManager.cs b/Source/Game/Maps/TerrainManager.cs
index 1086c72c8..437fd17b0 100644
--- a/Source/Game/Maps/TerrainManager.cs
+++ b/Source/Game/Maps/TerrainManager.cs
@@ -643,9 +643,9 @@ namespace Game.Maps
 
                     if (delta > collisionHeight)                   // Under water
                         status = ZLiquidStatus.UnderWater;
-                    if (delta > 0.0f)                   // In water
+                    else if (delta > 0.0f)                   // In water
                         status = ZLiquidStatus.InWater;
-                    if (delta > -0.1f)                   // Walk on water
+                    else if (delta > -0.1f)                   // Walk on water
                         status = ZLiquidStatus.WaterWalk;
 
                     if (status != ZLiquidStatus.AboveWater)