diff --git a/server/masterserver/svrmgr.cc b/server/masterserver/svrmgr.cc
index b1fbbc7..ff0df1c 100644
--- a/server/masterserver/svrmgr.cc
+++ b/server/masterserver/svrmgr.cc
@@ -42,9 +42,10 @@ void SvrMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_Reque
 
 void SvrMgr::_SS_IM_ReportServerInfo(f8::MsgHdr& hdr, const ss::SS_IM_ReportServerInfo& msg)
 {
+    SvrNode* svr = GetNodeBySocket(hdr.socket_handle);
     std::string key = msg.ip() + ":" + a8::XValue(msg.port()).GetString();
 
-    SvrNode* svr = GetNodeByKey(key);
+    svr = GetNodeByKey(key);
     if (svr) {
         if (svr->online_num != msg.online_num() ||
             svr->servicing != msg.servicing()