diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 1c62d1ae..06cd6de4 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1843,6 +1843,9 @@ void Room::CombineTeam()
     if (!mt::Param::s().prebattle_combine_team) {
         return;
     }
+    if (IsCustomBattle()) {
+        return;
+    }
     std::map<int, size_t> need_combine_teams;
     std::map<int, size_t> need_combine_teams_copy;