diff --git a/server/wsproxy/mastersvrmgr.cc b/server/wsproxy/mastersvrmgr.cc
index f1ccf6c..710cea6 100644
--- a/server/wsproxy/mastersvrmgr.cc
+++ b/server/wsproxy/mastersvrmgr.cc
@@ -52,6 +52,8 @@ void MasterSvrMgr::RequestTargetServer(f8::MsgHdr& hdr, const std::string& team_
         msg.set_team_id(team_id);
         svr->SendMsg(msg);
         pending_socket_hash_[hdr.socket_handle] = curr_context_id_;
+        assert(pending_request_hash_.find(curr_context_id_) == pending_request_hash_.end());
+        pending_request_hash_[curr_context_id_] = hdr.Clone();
     }
 }