diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index aab8f00adc..94afbc8644 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -2557,6 +2557,9 @@ static int32_t tmqGetWalInfoCb(void* param, SDataBuf* pMsg, int32_t code) {
 }
 
 static void destroyCommonInfo(SMqVgCommon* pCommon) {
+  if(pCommon == NULL){
+    return;
+  }
   taosArrayDestroy(pCommon->pList);
   tsem_destroy(&pCommon->rsp);
   taosThreadMutexDestroy(&pCommon->mutex);
diff --git a/source/dnode/vnode/src/tq/tqOffset.c b/source/dnode/vnode/src/tq/tqOffset.c
index 0a9905b544..11bb737225 100644
--- a/source/dnode/vnode/src/tq/tqOffset.c
+++ b/source/dnode/vnode/src/tq/tqOffset.c
@@ -104,7 +104,7 @@ STqOffsetStore* tqOffsetOpen(STQ* pTq) {
   pStore->needCommit = 0;
   pTq->pOffsetStore = pStore;
 
-  pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_NO_LOCK);
+  pStore->pHash = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK);
   if (pStore->pHash == NULL) {
     taosMemoryFree(pStore);
     return NULL;