diff --git a/Source/Game/Movement/Generators/RandomMovementGenerator.cs b/Source/Game/Movement/Generators/RandomMovementGenerator.cs
index 7cf253773..275fd083c 100644
--- a/Source/Game/Movement/Generators/RandomMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/RandomMovementGenerator.cs
@@ -162,7 +162,8 @@ namespace Game.Movement
             }
 
             bool result = _path.CalculatePath(position.GetPositionX(), position.GetPositionY(), position.GetPositionZ());
-            if (!result || _path.GetPathType().HasFlag(PathType.NoPath) || _path.GetPathType().HasFlag(PathType.Shortcut) || _path.GetPathType().HasFlag(PathType.FarFromPoly))
+            // PATHFIND_FARFROMPOLY shouldn't be checked as creatures in water are most likely far from poly
+            if (!result || _path.GetPathType().HasFlag(PathType.NoPath) || _path.GetPathType().HasFlag(PathType.Shortcut))// || _path.GetPathType().HasFlag(PathType.FarFromPoly))
             {
                 _timer.Reset(100);
                 return;