diff --git a/store/tikv/mock-tikv/rpc.go b/store/tikv/mock-tikv/rpc.go
index aada9585f0b18..86369676081fc 100644
--- a/store/tikv/mock-tikv/rpc.go
+++ b/store/tikv/mock-tikv/rpc.go
@@ -43,12 +43,10 @@ func newRPCHandler(cluster *Cluster, mvccStore *MvccStore, storeID uint64) *rpcH
 }
 
 func (h *rpcHandler) handleRequest(req *kvrpcpb.Request) *kvrpcpb.Response {
-	resp := &kvrpcpb.Response{
-		Type: req.Type,
-	}
+	var resp kvrpcpb.Response
 	if err := h.checkContext(req.GetContext()); err != nil {
 		resp.RegionError = err
-		return resp
+		return &resp
 	}
 	switch req.GetType() {
 	case kvrpcpb.MessageType_CmdGet:
@@ -75,7 +73,8 @@ func (h *rpcHandler) handleRequest(req *kvrpcpb.Request) *kvrpcpb.Response {
 	case kvrpcpb.MessageType_CmdRawDelete:
 		resp.CmdRawDeleteResp = h.onRawDelete(req.CmdRawDeleteReq)
 	}
-	return resp
+	resp.Type = req.Type
+	return &resp
 }
 
 func (h *rpcHandler) checkContext(ctx *kvrpcpb.Context) *errorpb.Error {
diff --git a/store/tikv/region_request.go b/store/tikv/region_request.go
index 57e063817308f..e4b313c19967f 100644
--- a/store/tikv/region_request.go
+++ b/store/tikv/region_request.go
@@ -89,6 +89,7 @@ func (s *RegionRequestSender) SendKVReq(req *kvrpcpb.Request, regionID RegionVer
 			if retry {
 				continue
 			}
+			return resp, nil
 		}
 
 		if resp.GetType() != req.GetType() {