diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
index 06bea1b4cf..2e6ed282e3 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
@@ -79,6 +79,11 @@ public class L2WaterZone extends L2ZoneType
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
 		{
+			// Mobius: Attempt to stop water task.
+			if (!character.isInsideZone(ZoneId.WATER))
+			{
+				((L2PcInstance) character).stopWaterTask();
+			}
 			character.getActingPlayer().broadcastUserInfo();
 		}
 		else if (character.isNpc())
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
index 06bea1b4cf..2e6ed282e3 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
@@ -79,6 +79,11 @@ public class L2WaterZone extends L2ZoneType
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
 		{
+			// Mobius: Attempt to stop water task.
+			if (!character.isInsideZone(ZoneId.WATER))
+			{
+				((L2PcInstance) character).stopWaterTask();
+			}
 			character.getActingPlayer().broadcastUserInfo();
 		}
 		else if (character.isNpc())
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
index 06bea1b4cf..2e6ed282e3 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
@@ -79,6 +79,11 @@ public class L2WaterZone extends L2ZoneType
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
 		{
+			// Mobius: Attempt to stop water task.
+			if (!character.isInsideZone(ZoneId.WATER))
+			{
+				((L2PcInstance) character).stopWaterTask();
+			}
 			character.getActingPlayer().broadcastUserInfo();
 		}
 		else if (character.isNpc())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
index 06bea1b4cf..2e6ed282e3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
@@ -79,6 +79,11 @@ public class L2WaterZone extends L2ZoneType
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
 		{
+			// Mobius: Attempt to stop water task.
+			if (!character.isInsideZone(ZoneId.WATER))
+			{
+				((L2PcInstance) character).stopWaterTask();
+			}
 			character.getActingPlayer().broadcastUserInfo();
 		}
 		else if (character.isNpc())
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
index c5a6177aac..d6186caabb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
@@ -73,6 +73,11 @@ public class L2WaterZone extends L2ZoneType
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
 		{
+			// Mobius: Attempt to stop water task.
+			if (!character.isInsideZone(ZoneId.WATER))
+			{
+				((L2PcInstance) character).stopWaterTask();
+			}
 			character.getActingPlayer().broadcastUserInfo();
 		}
 		else if (character.isNpc())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
index 06bea1b4cf..2e6ed282e3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/zone/type/L2WaterZone.java
@@ -79,6 +79,11 @@ public class L2WaterZone extends L2ZoneType
 		// TODO: update to only send speed status when that packet is known
 		if (character.isPlayer())
 		{
+			// Mobius: Attempt to stop water task.
+			if (!character.isInsideZone(ZoneId.WATER))
+			{
+				((L2PcInstance) character).stopWaterTask();
+			}
 			character.getActingPlayer().broadcastUserInfo();
 		}
 		else if (character.isNpc())