diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
index b3f8ab050e..b962a20039 100644
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
@@ -123,9 +123,10 @@ void RandomMovementGenerator<Creature>::SetRandomLocation(Creature* owner)
 
     _path->SetPathLengthLimit(30.0f);
     bool result = _path->CalculatePath(position.GetPositionX(), position.GetPositionY(), position.GetPositionZ());
+    // PATHFIND_FARFROMPOLY shouldn't be checked as creatures in water are most likely far from poly
     if (!result || (_path->GetPathType() & PATHFIND_NOPATH)
         || (_path->GetPathType() & PATHFIND_SHORTCUT)
-        || (_path->GetPathType() & PATHFIND_FARFROMPOLY))
+        /*|| (_path->GetPathType() & PATHFIND_FARFROMPOLY)*/)
     {
         _timer.Reset(500);
         return;