diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 94d4d57d..2f55a08e 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -540,10 +540,14 @@ void Room::CreateAndroid(int robot_num, std::shared_ptr<Team> team)
         hum->Initialize();
         AddToEntityHash(hum);
         AddToHumanHash(hum);
-        if (team) {
-            team->AddMember(hum);
-        } else {
+        if (GetMapModeMeta()->mapMode() != mt::kCircuitMatchMode) {
             MatchTeam(hum);
+        } else {
+            if (team) {
+                team->AddMember(hum);
+            } else {
+                MatchTeam(hum);
+            }
         }
         if (!hum->IsOb()) {
             IncAliveCount();