diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 97eb7d609b..6fd90dc505 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -523,6 +523,7 @@ int32_t mndPersistTaskDeployReq(STrans *pTrans, SStreamTask *pTask) {
 
   int32_t code = tEncodeStreamTask(&encoder, pTask);
   if (code == -1) {
+    tEncoderClear(&encoder);
     return TSDB_CODE_INVALID_MSG;
   }
 
@@ -1009,6 +1010,7 @@ static int32_t mndBuildStreamCheckpointSourceReq(void **pBuf, int32_t *pLen, int
   tEncoderInit(&encoder, abuf, tlen);
   int32_t pos = tEncodeStreamCheckpointSourceReq(&encoder, &req);
   if (pos == -1) {
+    tEncoderClear(&encoder);
     return TSDB_CODE_INVALID_MSG;
   }
 
diff --git a/source/dnode/mnode/impl/test/stream/stream.cpp b/source/dnode/mnode/impl/test/stream/stream.cpp
index 4c63c2ba2c..d508cf7390 100644
--- a/source/dnode/mnode/impl/test/stream/stream.cpp
+++ b/source/dnode/mnode/impl/test/stream/stream.cpp
@@ -91,6 +91,7 @@ SRpcMsg buildHbReq() {
   tEncoderInit(&encoder, (uint8_t*)buf, tlen);
   if ((code = tEncodeStreamHbMsg(&encoder, &msg)) < 0) {
     rpcFreeCont(buf);
+    tEncoderClear(&encoder);
     goto _end;
   }
   tEncoderClear(&encoder);
diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c
index 17aef821f8..0bc090cdfe 100644
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@@ -214,6 +214,7 @@ int32_t streamSendCheckMsg(SStreamTask* pTask, const SStreamTaskCheckReq* pReq,
   tEncoderInit(&encoder, abuf, tlen);
   if ((code = tEncodeStreamTaskCheckReq(&encoder, pReq)) < 0) {
     rpcFreeCont(buf);
+    tEncoderClear(&encoder);
     return code;
   }
   tEncoderClear(&encoder);
@@ -845,6 +846,7 @@ int32_t initCheckpointReadyMsg(SStreamTask* pTask, int32_t upstreamNodeId, int32
   tEncoderInit(&encoder, abuf, tlen);
   if ((code = tEncodeStreamCheckpointReadyMsg(&encoder, &req)) < 0) {
     rpcFreeCont(buf);
+    tEncoderClear(&encoder);
     return code;
   }
   tEncoderClear(&encoder);
@@ -1168,6 +1170,7 @@ int32_t doSendDispatchMsg(SStreamTask* pTask, const SStreamDispatchReq* pReq, in
   SEncoder encoder;
   tEncoderInit(&encoder, abuf, tlen);
   if ((code = tEncodeStreamDispatchReq(&encoder, pReq)) < 0) {
+    tEncoderClear(&encoder);
     goto FAIL;
   }
   tEncoderClear(&encoder);
diff --git a/source/libs/stream/src/streamHb.c b/source/libs/stream/src/streamHb.c
index 1ef938494e..1fd3106cff 100644
--- a/source/libs/stream/src/streamHb.c
+++ b/source/libs/stream/src/streamHb.c
@@ -95,6 +95,7 @@ static int32_t doSendHbMsgInfo(SStreamHbMsg* pMsg, SStreamMeta* pMeta, SEpSet* p
   tEncoderInit(&encoder, buf, tlen);
   if ((code = tEncodeStreamHbMsg(&encoder, pMsg)) < 0) {
     rpcFreeCont(buf);
+    tEncoderClear(&encoder);
     stError("vgId:%d encode stream hb msg failed, code:%s", pMeta->vgId, tstrerror(code));
     return TSDB_CODE_FAILED;
   }
diff --git a/source/libs/stream/src/streamTask.c b/source/libs/stream/src/streamTask.c
index 416faa7487..0791784656 100644
--- a/source/libs/stream/src/streamTask.c
+++ b/source/libs/stream/src/streamTask.c
@@ -870,6 +870,7 @@ int32_t streamSendChkptReportMsg(SStreamTask* pTask, SCheckpointInfo* pCheckpoin
   tEncoderInit(&encoder, buf, tlen);
   if ((code = tEncodeStreamTaskChkptReport(&encoder, &req)) < 0) {
     rpcFreeCont(buf);
+    tEncoderClear(&encoder);
     stError("s-task:%s vgId:%d encode stream task checkpoint-report msg failed, code:%s", id, vgId, tstrerror(code));
     return -1;
   }
@@ -1021,6 +1022,7 @@ int32_t streamTaskSendCheckpointReq(SStreamTask* pTask) {
   tEncoderInit(&encoder, buf, tlen);
   if ((code = tEncodeStreamTaskCheckpointReq(&encoder, &req)) < 0) {
     rpcFreeCont(buf);
+    tEncoderClear(&encoder);
     stError("s-task:%s vgId:%d encode stream task req checkpoint msg failed, code:%s", id, vgId, tstrerror(code));
     return -1;
   }
diff --git a/source/libs/stream/src/streamUpdate.c b/source/libs/stream/src/streamUpdate.c
index 8e32822fb7..3f7210d3c9 100644
--- a/source/libs/stream/src/streamUpdate.c
+++ b/source/libs/stream/src/streamUpdate.c
@@ -455,7 +455,7 @@ int32_t updateInfoSerialize(void* buf, int32_t bufLen, const SUpdateInfo* pInfo,
 
   SEncoder encoder = {0};
   tEncoderInit(&encoder, buf, bufLen);
-  if (tStartEncode(&encoder) < 0) {
+  if (tStartEncode(&encoder) != 0) {
     code = TSDB_CODE_FAILED;
     QUERY_CHECK_CODE(code, lino, _end);
   }
@@ -551,10 +551,10 @@ int32_t updateInfoSerialize(void* buf, int32_t bufLen, const SUpdateInfo* pInfo,
   tEndEncode(&encoder);
 
   int32_t tlen = encoder.pos;
-  tEncoderClear(&encoder);
   *pLen = tlen;
 
 _end:
+  tEncoderClear(&encoder);
   if (code != TSDB_CODE_SUCCESS) {
     uError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
   }