diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 9313b9d..1837412 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1123,7 +1123,7 @@ void Room::CombineTeam()
 
     for (auto& pair : team_hash_) {
         for (Human* hum : pair.second) {
-            if (hum->auto_fill) {
+            if (hum->auto_fill && !hum->team_uuid.empty()) {
                 need_combine_teams[pair.first] = pair.second.size();
                 break;
             }