diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 3fe57284..1f38aacb 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -2091,6 +2091,9 @@ void Room::CombineTeam()
 
 void Room::FillTeam()
 {
+    if (GetMapModeMeta()->mapMode() == mt::kCircuitMatchMode) {
+        return;
+    }
     std::vector<std::shared_ptr<Team>> free_team_list;
     TraverseTeams
         (