diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index f6ad5c7f..b635632b 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1473,8 +1473,7 @@ void Room::MatchTeam(Human* hum)
 
 void Room::CombineTeam()
 {
-    return;
-    if (mt::Param::s().prebattle_combine_team) {
+    if (!mt::Param::s().prebattle_combine_team) {
         return;
     }
     std::map<int, size_t> need_combine_teams;