diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp
index 5f9ec3ac..9387955d 100644
--- a/src/AiFactory.cpp
+++ b/src/AiFactory.cpp
@@ -561,8 +561,8 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
             if (sPlayerbotAIConfig->randomBotJoinBG)
                 nonCombatEngine->addStrategy("bg");
 
-            if (!master || GET_PLAYERBOT_AI(master))
-                nonCombatEngine->addStrategy("maintenance");
+            // if (!master || GET_PLAYERBOT_AI(master))
+            //     nonCombatEngine->addStrategy("maintenance");
 
             nonCombatEngine->ChangeStrategy(sPlayerbotAIConfig->randomBotNonCombatStrategies);
         }
@@ -589,8 +589,8 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
                             nonCombatEngine->addStrategy("move random");
                         }
 
-                        if (masterBotAI)
-                            nonCombatEngine->addStrategy("maintenance");
+                        // if (masterBotAI)
+                        //     nonCombatEngine->addStrategy("maintenance");
 
                         nonCombatEngine->ChangeStrategy(sPlayerbotAIConfig->randomBotNonCombatStrategies);
                     }
diff --git a/src/PlayerbotFactory.cpp b/src/PlayerbotFactory.cpp
index 4a0491dc..c2fd50c8 100644
--- a/src/PlayerbotFactory.cpp
+++ b/src/PlayerbotFactory.cpp
@@ -500,7 +500,7 @@ void PlayerbotFactory::InitPet()
     Pet* pet = bot->GetPet();
     if (!pet)
     {
-        if (bot->getClass() != CLASS_HUNTER)
+        if (bot->getClass() != CLASS_HUNTER || bot->GetLevel() < 10)
             return;
 
         Map* map = bot->GetMap();