diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c
index c6fb64f004ed8edf5769725bfc2085a0a2c89da4..3b63de3616e8f8e7cad7b69c928e76b2e32c4c60 100644
--- a/src/tsdb/src/tsdbCommit.c
+++ b/src/tsdb/src/tsdbCommit.c
@@ -303,27 +303,28 @@ static int tsdbCommitToFileGroup(STsdbRepo *pRepo, SFileGroup *pOldGroup, SFileG
 
   for (int tid = 1; tid < pTSCh->maxIters; tid++) {
     if (tsdbCommitTableData(pTSCh, tid) < 0) {
-      tsdbHelperCloseFile(pWHelper, true /* hasError = false */);
+      tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */);
       return -1;
     }
 
     if (tsdbTryMoveLastBlock(pTSCh) < 0) {
-      tsdbHelperCloseFile(pWHelper, true /* hasError = false */);
+      tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */);
       return -1;
     }
 
     if (tsdbWriteBlockInfo(pWHelper) < 0) {
-      tsdbHelperCloseFile(pWHelper, true /* hasError = false */);
+      tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */);
       return -1;
     }
   }
 
   if (tsdbWriteBlockIdx(pWHelper) < 0) {
-      tsdbHelperCloseFile(pWHelper, true /* hasError = false */);
-      return -1;
+    tsdbCloseAndUnsetCommitFGroup(pTSCh, true /* hasError = true */);
+    return -1;
   }
 
-  tsdbHelperCloseFile(pWHelper, false /* hasError = false */);
+  tsdbCloseAndUnsetCommitFGroup(pTSCh, false /* hasError = true */);
+
   return 0;
 }