diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index ac616d03..e127fedd 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -135,6 +135,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
     }
     if (!msg.custom_room_payload().empty()) {
         _CMJoinCustomBattle(hdr, msg);
+        return;
     }
     std::shared_ptr<cs::CMJoin> join_msg = std::make_shared<cs::CMJoin>();
     *join_msg = msg;
@@ -912,7 +913,8 @@ void RoomMgr::_CMJoinCustomBattle(f8::MsgHdr& hdr, const cs::CMJoin& msg)
     auto ip_saddr = hdr.ip_saddr;
     auto socket_handle = hdr.socket_handle;
     auto cb =
-        [join_msg, ip_saddr, socket_handle] (int errcode, const std::string errmsg, std::shared_ptr<CustomBattle> p)
+        [join_msg, ip_saddr, socket_handle]
+        (int errcode, const std::string errmsg, std::shared_ptr<CustomBattle> p)
         {
             auto& msg = *join_msg;
             if (!errcode) {