diff --git a/src/vnode/tsdb/src/tsdbMain.c b/src/vnode/tsdb/src/tsdbMain.c
index 6873c69c2a7377c09a2cbffa3269cdf96212452d..ee9413fc121c0709ee9a672fa5f86880266478b2 100644
--- a/src/vnode/tsdb/src/tsdbMain.c
+++ b/src/vnode/tsdb/src/tsdbMain.c
@@ -813,6 +813,13 @@ static SSkipListIterator **tsdbCreateTableIters(STsdbMeta *pMeta, int maxTables)
   return iters;
 }
 
+static void tsdbFreeMemTable(SMemTable *pMemTable) {
+  if (pMemTable) {
+    tSkipListDestroy(pMemTable->pData);
+    free(pMemTable);
+  }
+}
+
 // Commit to file
 static void *tsdbCommitData(void *arg) {
   // TODO
@@ -859,7 +866,8 @@ static void *tsdbCommitData(void *arg) {
   // TODO: free the skiplist
   for (int i = 0; i < pCfg->maxTables; i++) {
     STable *pTable = pMeta->tables[i];
-    if (pTable && pTable->imem) { // Here has memory leak
+    if (pTable && pTable->imem) {
+      tsdbFreeMemTable(pTable->imem);
       pTable->imem = NULL;
     }
   }
diff --git a/src/vnode/tsdb/src/tsdbMeta.c b/src/vnode/tsdb/src/tsdbMeta.c
index 0eb6dde1d0b44c65a521f46e2dfdafdee069a16b..0ab276c120ee4085d04c8b51b4d2de5c4d58f40c 100644
--- a/src/vnode/tsdb/src/tsdbMeta.c
+++ b/src/vnode/tsdb/src/tsdbMeta.c
@@ -34,7 +34,7 @@ void *tsdbEncodeTable(STable *pTable, int *contLen) {
   *contLen = tsdbEstimateTableEncodeSize(pTable);
   if (*contLen < 0) return NULL;
 
-  void *ret = malloc(*contLen);
+  void *ret = calloc(1, *contLen);
   if (ret == NULL) return NULL;
 
   void *ptr = ret;