diff --git a/source/manager.cpp b/source/manager.cpp
index c63900b..af8418c 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -480,11 +480,11 @@ void BotManager::MaintainBotQuota (void)
       int numHumans = GetHumansNum ();
       int desiredCount = yb_quota.GetInt ();
 
-      if (yb_join_after_player.GetBool () && !numHumans)
-         desiredCount = 0;
-
       int numHumansOnTeam = yb_autovacate_smart_kick.GetBool () ? GetHumansJoinedTeam () : numHumans;
 
+      if (yb_join_after_player.GetBool () && !numHumansOnTeam)
+          desiredCount = 0;
+
       // quota mode
       char mode = yb_quota_mode.GetString ()[0];
 
@@ -1692,4 +1692,4 @@ void BotManager::SelectLeaderEachTeam (int team, bool reset)
             bot->RadioMessage (Radio_FollowMe);
       }
    }
-}
\ No newline at end of file
+}