diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 255e8b4..ab94a60 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1300,23 +1300,23 @@ void Room::CombineTeam()
                             need_combine_teams_copy.erase(team_id2);
                         } else {
                             if (pair1.second >= pair2.second) {
-                                need_combine_teams.erase(team_id2);
-                                need_combine_teams_copy.erase(team_id2);
                                 if (pair1.second + pair2.second >= MAX_TEAM_NUM) {
                                     need_combine_teams.erase(team_id1);
                                     need_combine_teams_copy.erase(team_id1);
                                 } else {
                                     pair1.second = new_team_num;
                                 }
+                                need_combine_teams.erase(team_id2);
+                                need_combine_teams_copy.erase(team_id2);
                             } else {
-                                need_combine_teams.erase(team_id1);
-                                need_combine_teams_copy.erase(team_id1);
                                 if (pair1.second + pair2.second >= MAX_TEAM_NUM) {
                                     need_combine_teams.erase(team_id2);
                                     need_combine_teams_copy.erase(team_id2);
                                 } else {
                                     pair2.second = new_team_num;
                                 }
+                                need_combine_teams.erase(team_id1);
+                                need_combine_teams_copy.erase(team_id1);
                             }
                         }
                         combine_ok = true;