diff --git a/source/libs/executor/src/streamtimewindowoperator.c b/source/libs/executor/src/streamtimewindowoperator.c
index a95a2b053e..6e2ef59ae4 100644
--- a/source/libs/executor/src/streamtimewindowoperator.c
+++ b/source/libs/executor/src/streamtimewindowoperator.c
@@ -2238,10 +2238,12 @@ int32_t initStreamAggSupporter(SStreamAggSupporter* pSup, SExprSupp* pExpSup, in
   *(pSup->pState) = *pState;
   pSup->stateStore.streamStateSetNumber(pSup->pState, -1, tsIndex);
   int32_t funResSize = getMaxFunResSize(pExpSup, numOfOutput);
-  // used for backward compatibility of function's result info
-  pSup->pState->pResultRowStore.resultRowGet = getResultRowFromBuf;
-  pSup->pState->pResultRowStore.resultRowPut = putResultRowToBuf;
-  pSup->pState->pExprSupp = pExpSup;
+  if (stateType != STREAM_STATE_BUFF_HASH_SORT) {
+    // used for backward compatibility of function's result info
+    pSup->pState->pResultRowStore.resultRowGet = getResultRowFromBuf;
+    pSup->pState->pResultRowStore.resultRowPut = putResultRowToBuf;
+    pSup->pState->pExprSupp = pExpSup;
+  }
 
   if (stateType == STREAM_STATE_BUFF_SORT) {
   pSup->pState->pFileState = NULL;
diff --git a/source/libs/stream/src/streamBackendRocksdb.c b/source/libs/stream/src/streamBackendRocksdb.c
index a0a4f2d516..5f73b3913f 100644
--- a/source/libs/stream/src/streamBackendRocksdb.c
+++ b/source/libs/stream/src/streamBackendRocksdb.c
@@ -4328,7 +4328,7 @@ int32_t streamStatePutParTag_rocksdb(SStreamState* pState, int64_t groupId, cons
   int    code = 0;
   char*  dst = NULL;
   size_t size = 0;
-  if (pState->pResultRowStore.resultRowPut == NULL || pState->pExprSupp == NULL) {
+  if (pState->pResultRowStore.resultRowPut == NULL || pState->pExprSupp == NULL || tag == NULL) {
     STREAM_STATE_PUT_ROCKSDB(pState, "partag", &groupId, tag, tagLen);
     return code;
   }
@@ -4607,7 +4607,9 @@ int32_t streamStatePutBatchOptimize(SStreamState* pState, int32_t cfIdx, rocksdb
   rocksdb_column_family_handle_t* pCf = wrapper->pCf[ginitDict[cfIdx].idx];
   rocksdb_writebatch_put_cf((rocksdb_writebatch_t*)pBatch, pCf, buf, (size_t)klen, ttlV, (size_t)ttlVLen);
 
-  taosMemoryFree(dst);
+  if (pState->pResultRowStore.resultRowPut != NULL && pState->pExprSupp != NULL) {
+    taosMemoryFree(dst);
+  }
 
   if (tmpBuf == NULL) {
     taosMemoryFree(ttlV);