diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 653666ee7055f7a4194974d59833cd8d6cc427f8..9ca5e8e73e2fe925f495d01d0e71a36fbefec080 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -1014,42 +1014,36 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
     pTransInst->cfp(pTransInst->parent, pResp, NULL);
     return 0;
   }
-
-  STransConnCtx* pCtx = pMsg->ctx;
-  if (pCtx->retryCnt == 0) {
-    pCtx->origEpSet = pCtx->epSet;
-  }
   /*
    *  no retry
    *  1. query conn
    *  2. rpc thread already receive quit msg
    */
-  int32_t code = pResp->code;
-  if (CONN_NO_PERSIST_BY_APP(pConn)) {
-    if (pTransInst->retry != NULL && pTransInst->retry(code)) {
-      pMsg->sent = 0;
-      pCtx->retryCnt += 1;
-      if (code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
-        cliUpdateRetryLimit(&pCtx->retryLimit, TRANS_RETRY_COUNT_LIMIT, EPSET_GET_SIZE(&pCtx->epSet) * 3);
-        if (pCtx->retryCnt < pCtx->retryLimit) {
-          transUnrefCliHandle(pConn);
+  STransConnCtx* pCtx = pMsg->ctx;
+  int32_t        code = pResp->code;
+  if (pTransInst->retry != NULL && pTransInst->retry(code)) {
+    pMsg->sent = 0;
+    pCtx->retryCnt += 1;
+    if (code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
+      cliUpdateRetryLimit(&pCtx->retryLimit, TRANS_RETRY_COUNT_LIMIT, EPSET_GET_SIZE(&pCtx->epSet) * 3);
+      if (pCtx->retryCnt < pCtx->retryLimit) {
+        transUnrefCliHandle(pConn);
+        EPSET_FORWARD_INUSE(&pCtx->epSet);
+        cliSchedMsgToNextNode(pMsg, pThrd);
+        return -1;
+      }
+    } else {
+      cliUpdateRetryLimit(&pCtx->retryLimit, TRANS_RETRY_COUNT_LIMIT, TRANS_RETRY_COUNT_LIMIT);
+      if (pCtx->retryCnt < pCtx->retryLimit) {
+        addConnToPool(pThrd->pool, pConn);
+        if (pResp->contLen == 0) {
           EPSET_FORWARD_INUSE(&pCtx->epSet);
-          cliSchedMsgToNextNode(pMsg, pThrd);
-          return -1;
-        }
-      } else {
-        cliUpdateRetryLimit(&pCtx->retryLimit, TRANS_RETRY_COUNT_LIMIT, TRANS_RETRY_COUNT_LIMIT);
-        if (pCtx->retryCnt < pCtx->retryLimit) {
-          addConnToPool(pThrd->pool, pConn);
-          if (pResp->contLen == 0) {
-            EPSET_FORWARD_INUSE(&pCtx->epSet);
-          } else {
-            tDeserializeSEpSet(pResp->pCont, pResp->contLen, &pCtx->epSet);
-          }
-          transFreeMsg(pResp->pCont);
-          cliSchedMsgToNextNode(pMsg, pThrd);
-          return -1;
+        } else {
+          tDeserializeSEpSet(pResp->pCont, pResp->contLen, &pCtx->epSet);
         }
+        transFreeMsg(pResp->pCont);
+        cliSchedMsgToNextNode(pMsg, pThrd);
+        return -1;
       }
     }
   }
@@ -1185,6 +1179,7 @@ void transSendRecv(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, STransM
 
   STransConnCtx* pCtx = taosMemoryCalloc(1, sizeof(STransConnCtx));
   pCtx->epSet = *pEpSet;
+  pCtx->origEpSet = *pEpSet;
   pCtx->ahandle = pReq->info.ahandle;
   pCtx->msgType = pReq->msgType;
   pCtx->pSem = sem;