diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 0e94e65..1e9788c 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1206,6 +1206,9 @@ void Room::CombineTeam()
                         break;
                     }
                 }
+            }//end for
+            if (combine_ok) {
+                break;
             }
         }
     } while (combine_ok);