diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index fe65911780..b893c9ab95 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -1215,8 +1215,12 @@ void* doFetchRow(SRequestObj* pRequest) {
       tsem_wait(&pRequest->body.rspSem);
 
       pRequest->type = TDMT_VND_SHOW_TABLES_FETCH;
-    } else if (pRequest->type == TDMT_MND_SHOW_RETRIEVE && pResultInfo->pData != NULL) {
-      return NULL;
+    } else if (pRequest->type == TDMT_MND_SHOW_RETRIEVE) {      
+      epSet = getEpSet_s(&pRequest->pTscObj->pAppInfo->mgmtEp);
+      
+      if (pResultInfo->completed) {
+        return NULL;
+      }
     }
 
     SMsgSendInfo* body = buildMsgInfoImpl(pRequest);
diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c
index 6f74c29650..7e897287f6 100644
--- a/source/client/src/clientMsgHandler.c
+++ b/source/client/src/clientMsgHandler.c
@@ -201,6 +201,7 @@ int32_t processRetrieveMnodeRsp(void* param, const SDataBuf* pMsg, int32_t code)
   pResInfo->pRspMsg   = pMsg->pData;
   pResInfo->numOfRows = pRetrieve->numOfRows;
   pResInfo->pData     = pRetrieve->data;
+  pResInfo->completed = pRetrieve->completed;
 
   pResInfo->current = 0;
   setResultDataPtr(pResInfo, pResInfo->fields, pResInfo->numOfCols, pResInfo->numOfRows);