diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
index d4cb63fb7b..c55e5f92ea 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCommit2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c
@@ -185,29 +185,22 @@ static int32_t tsdbCommitTombData(SCommitter2 *committer) {
     }
 
     if (record->ekey < committer->ctx->minKey) {
-      goto _next;
+      // do nothing
     } else if (record->skey > committer->ctx->maxKey) {
-      committer->ctx->maxKey = TMIN(record->skey, committer->ctx->maxKey);
-      goto _next;
+      committer->ctx->nextKey = TMIN(record->skey, committer->ctx->nextKey);
+    } else {
+      if (record->ekey > committer->ctx->maxKey) {
+        committer->ctx->nextKey = TMIN(committer->ctx->nextKey, committer->ctx->maxKey + 1);
+      }
+
+      record->skey = TMAX(record->skey, committer->ctx->minKey);
+      record->ekey = TMIN(record->ekey, committer->ctx->maxKey);
+
+      numRecord++;
+      code = tsdbFSetWriteTombRecord(committer->writer, record);
+      TSDB_CHECK_CODE(code, lino, _exit);
     }
 
-    TSKEY maxKey = committer->ctx->maxKey;
-    if (record->ekey > committer->ctx->maxKey) {
-      maxKey = committer->ctx->maxKey + 1;
-    }
-
-    if (record->ekey > committer->ctx->maxKey && committer->ctx->nextKey > maxKey) {
-      committer->ctx->nextKey = maxKey;
-    }
-
-    record->skey = TMAX(record->skey, committer->ctx->minKey);
-    record->ekey = TMIN(record->ekey, maxKey);
-
-    numRecord++;
-    code = tsdbFSetWriteTombRecord(committer->writer, record);
-    TSDB_CHECK_CODE(code, lino, _exit);
-
-  _next:
     code = tsdbIterMergerNext(committer->tombIterMerger);
     TSDB_CHECK_CODE(code, lino, _exit);
   }