diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 5494c5fd..d78e90ba 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1918,6 +1918,9 @@ void Room::CombineTeam()
     if (IsCustomBattle()) {
         return;
     }
+    if (GetMapModeMeta()->mapMode() == mt::kCircuitMatchMode) {
+        return;
+    }
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;
 
@@ -2113,7 +2116,7 @@ void Room::FillTeam()
             for (int i = pair.second->GetTeam()->GetMemberNum(); i < GetMaxTeamNum(); ++i) {
                 if (!free_team_list.empty()) {
                     std::shared_ptr<Team> b_team = free_team_list.at(free_team_list.size() - 1);
-                    pair.second->GetTeam()->CombineTeam(b_team.get());
+4                    pair.second->GetTeam()->CombineTeam(b_team.get());
                     free_team_list.erase(free_team_list.begin() + free_team_list.size() - 1);
                     team_hash_.erase(b_team->GetTeamId());
                 }