diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index ea9c87a5..3c25e6ee 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -21,6 +21,7 @@ enum NetHandler_e
     HID_RoomMgr,
     HID_MatchMgr,
     HID_MatchTeam,
+    HID_CustomBattle,
     HID_GGListener,
 };
 
diff --git a/server/gameserver/custom_battle.cc b/server/gameserver/custom_battle.cc
index ed34ebc7..aeabf115 100644
--- a/server/gameserver/custom_battle.cc
+++ b/server/gameserver/custom_battle.cc
@@ -293,4 +293,7 @@ void CustomBattle::OnEnter(std::shared_ptr<cs::CMJoin> join_msg, long ip_saddr,
     member->join_msg_ = join_msg;
     member->ip_saddr_ = ip_saddr;
     member->socket_handle_ = socket_handle;
+    if (socket_handle) {
+        socket_hash_[socket_handle] = member;
+    }
 }