diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 71d12a47..af8b349b 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -300,7 +300,7 @@ void MatchTeam::UpdateMaster()
                     TryCombineTeam();
                 }
             }
-            if (phase_left_time_ <= 0 || GetPredictMemberNum() >= MAX_TEAM_NUM) {
+            if (phase_left_time_ <= 0 || !HaveEmptySlot()) {
                 ChooseLeader();
                 phase_ = kMatchChoose;
                 phase_start_tick_ = a8::XGetTickCount();
@@ -313,7 +313,8 @@ void MatchTeam::UpdateMaster()
             UpdateTeamState();
             CheckChoose();
             CheckPrepare();
-            if ((phase_left_time_ <= MetaMgr::Instance()->match_lock_time) || IsAllPrepare()) {
+            if ((phase_left_time_ <= MetaMgr::Instance()->match_lock_time) ||
+                IsAllPrepare()) {
                 for (int i = 0; i < MAX_TEAM_NUM; ++i) {
                     AutoChoose(true);
                 }
diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h
index 2cebd79a..0f354d13 100644
--- a/server/gameserver/matchteam.h
+++ b/server/gameserver/matchteam.h
@@ -1,4 +1,4 @@
-#pragma once
+ #pragma once
 
 #include "cs_proto.pb.h"