diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index e28a9c84..b573e760 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3993,13 +3993,15 @@ void Room::OnBattleStart()
 
 void Room::AddTeam(class MatchTeam* team)
 {
-    if (team->GetCurrMembers().size() != MAX_TEAM_NUM) {
+    if (team->GetCurrMembers().size() != team->GetSlotNum()) {
         return;
     }
     Team* new_team = NewTeam();
     {
-        new_team->SetInitTeamMemberNum(MAX_TEAM_NUM);
+        new_team->SetInitTeamMemberNum(team->GetSlotNum());
+        #if 0
         new_team->SetAutoFill(true);
+        #endif
     }
     BornPoint* init_born_point = nullptr;
     for (auto& member : team->GetCurrMembers()) {