diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 7942aa02..6b1e2d02 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -280,7 +280,8 @@ Room* RoomMgr::GetJoinableRoom(const cs::CMJoin& msg,
     }
     for (auto& pair : inactive_room_hash_) {
         Room* room = pair.second;
-        if (room->CanJoin(msg.account_id(),
+        if (!room->GetCustomBattle() &&
+            room->CanJoin(msg.account_id(),
                           self_room_type,
                           (RoomMode_e)msg.room_mode(),
                           proto_version,