diff --git a/src/client/inc/tscSubquery.h b/src/client/inc/tscSubquery.h
index f21ce67e9e..9e16f3f900 100644
--- a/src/client/inc/tscSubquery.h
+++ b/src/client/inc/tscSubquery.h
@@ -52,6 +52,8 @@ int tsInsertInitialCheck(SSqlObj *pSql);
 
 void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs);
 
+void tscFreeRetrieveSupporters(SSqlObj *pSql);
+
 
 #ifdef __cplusplus
 }
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index b4fb832b14..9761c5b4ca 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2050,6 +2050,19 @@ void doCleanupSubqueries(SSqlObj *pSql, int32_t numOfSubs) {
   }
 }
 
+void tscFreeRetrieveSupporters(SSqlObj *pSql) {  
+  for(int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
+    SSqlObj* pSub = pSql->pSubs[i];
+    assert(pSub != NULL);
+    
+    SRetrieveSupport* pSupport = pSub->param;
+    
+    tfree(pSupport->localBuffer);
+    tfree(pSub->param);
+  }
+}
+
+
 void tscLockByThread(int64_t *lockedBy) {
   int64_t tid = taosGetSelfPthreadId();
   int     i = 0;
@@ -2731,6 +2744,8 @@ void tscHandleSubqueryError(SRetrieveSupport *trsupport, SSqlObj *pSql, int numO
 
       SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
 
+      tscFreeRetrieveSupporters(pParentSql);
+
       tscFreeSubobj(userSql);      
       tfree(userSql->pSubs);
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index d5323625da..67b1a1c199 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3767,6 +3767,8 @@ static void tscSubqueryCompleteCallback(void* param, TAOS_RES* tres, int code) {
 
     SSqlObj *userSql = ((SRetrieveSupport*)pParentSql->param)->pParentSql;
 
+    tscFreeRetrieveSupporters(pParentSql);
+
     tscFreeSubobj(userSql);    
     tfree(userSql->pSubs);