diff --git a/src/strategy/actions/NewRpgAction.cpp b/src/strategy/actions/NewRpgAction.cpp
index 0ba51d23..4c5f8d6a 100644
--- a/src/strategy/actions/NewRpgAction.cpp
+++ b/src/strategy/actions/NewRpgAction.cpp
@@ -33,36 +33,39 @@ bool NewRpgStatusUpdateAction::Execute(Event event)
             uint32 roll = urand(1, 100);
             // IDLE -> NEAR_NPC
             // if ((!info.lastNearNpc || info.lastNearNpc + setNpcInterval < getMSTime()) && roll <= 30)
-            if (roll <= 20)
+            if (roll <= 40)
             {
                 info.lastNearNpc = getMSTime();
                 GuidVector possibleTargets = AI_VALUE(GuidVector, "possible rpg targets");
-                if (possibleTargets.empty())
-                    break;
-                info.status = NewRpgStatus::NEAR_NPC;
-                return true;
+                if (!possibleTargets.empty())
+                {
+                    info.status = NewRpgStatus::NEAR_NPC;
+                    return true;
+                }
             }
             // IDLE -> GO_INNKEEPER
-            if (bot->GetLevel() >= 6 && roll <= 30)
+            if (bot->GetLevel() >= 6 && roll <= 55)
             {
                 WorldPosition pos = SelectRandomInnKeeperPos();
-                if (pos == WorldPosition() || bot->GetExactDist(pos) < 50.0f)
-                    break;
-                info.lastGoInnKeeper = getMSTime();
-                info.status = NewRpgStatus::GO_INNKEEPER;
-                info.innKeeperPos = pos;
-                return true;
+                if (pos != WorldPosition() && bot->GetExactDist(pos) > 50.0f)
+                {
+                    info.lastGoInnKeeper = getMSTime();
+                    info.status = NewRpgStatus::GO_INNKEEPER;
+                    info.innKeeperPos = pos;
+                    return true;
+                }
             }
             // IDLE -> GO_GRIND
             if (roll <= 90)
             {
                 WorldPosition pos = SelectRandomGrindPos();
-                if (pos == WorldPosition())
-                    break;
-                info.lastGoGrind = getMSTime();
-                info.status = NewRpgStatus::GO_GRIND;
-                info.grindPos = pos;
-                return true;
+                if (pos != WorldPosition())
+                {
+                    info.lastGoGrind = getMSTime();
+                    info.status = NewRpgStatus::GO_GRIND;
+                    info.grindPos = pos;
+                    return true;
+                }
             }
             // IDLE -> REST
             info.status = NewRpgStatus::REST;
@@ -164,7 +167,7 @@ WorldPosition NewRpgStatusUpdateAction::SelectRandomGrindPos()
         }
     }
     WorldPosition dest;
-    if (urand(1, 100) <= 50 && !hi_prepared_locs.empty())
+    if (urand(1, 100) <= 75 && !hi_prepared_locs.empty())
     {
         uint32 idx = urand(0, hi_prepared_locs.size() - 1);
         dest = hi_prepared_locs[idx];
@@ -236,7 +239,7 @@ bool NewRpgGoFarAwayPosAction::MoveFarTo(WorldPosition dest)
         PathGenerator path(bot);
         path.CalculatePath(dx, dy, dz);
         // bool canReach = bot->GetMap()->CanReachPositionAndGetValidCoords(bot, x, y, z, dx, dy, dz, false);
-        bool canReach = path.GetPathType() & (PATHFIND_NORMAL | PATHFIND_INCOMPLETE);
+        bool canReach = path.GetPathType() & PATHFIND_NORMAL;
 
         if (canReach)
         {
diff --git a/src/strategy/actions/NewRpgAction.h b/src/strategy/actions/NewRpgAction.h
index bb07581a..5bef88aa 100644
--- a/src/strategy/actions/NewRpgAction.h
+++ b/src/strategy/actions/NewRpgAction.h
@@ -23,9 +23,9 @@ public:
 protected:
     // const int32 setGrindInterval = 5 * 60 * 1000;
     // const int32 setNpcInterval = 1 * 60 * 1000;
-    const int32 statusNearNpcDuration = 3 * 60 * 1000;
+    const int32 statusNearNpcDuration = 5 * 60 * 1000;
     const int32 statusNearRandomDuration = 3 * 60 * 1000;
-    const int32 statusRestDuration = 1 * 60 * 1000;
+    const int32 statusRestDuration = 2 * 60 * 1000;
     WorldPosition SelectRandomGrindPos();
     WorldPosition SelectRandomInnKeeperPos();
 };
diff --git a/src/strategy/values/PossibleRpgTargetsValue.h b/src/strategy/values/PossibleRpgTargetsValue.h
index 02df8701..287f5db3 100644
--- a/src/strategy/values/PossibleRpgTargetsValue.h
+++ b/src/strategy/values/PossibleRpgTargetsValue.h
@@ -14,7 +14,7 @@ class PlayerbotAI;
 class PossibleRpgTargetsValue : public NearestUnitsValue
 {
 public:
-    PossibleRpgTargetsValue(PlayerbotAI* botAI, float range = sPlayerbotAIConfig->rpgDistance);
+    PossibleRpgTargetsValue(PlayerbotAI* botAI, float range = 70.0f);
 
     static std::vector<uint32> allowedNpcFlags;