diff --git a/kernel/model/block.go b/kernel/model/block.go
index 958cdf479..5b59475ab 100644
--- a/kernel/model/block.go
+++ b/kernel/model/block.go
@@ -364,7 +364,7 @@ func TransferBlockRef(fromID, toID string, refIDs []string) (err error) {
 		}
 	}
 
-	sql.WaitForWritingDatabase()
+	sql.FlushQueue()
 	return
 }
 
diff --git a/kernel/model/blockial.go b/kernel/model/blockial.go
index a1a32b3bd..b34d2028e 100644
--- a/kernel/model/blockial.go
+++ b/kernel/model/blockial.go
@@ -191,9 +191,7 @@ func setNodeAttrs(node *ast.Node, tree *parse.Tree, nameValues map[string]string
 	pushBroadcastAttrTransactions(oldAttrs, node)
 
 	go func() {
-		if !sql.IsEmptyQueue() {
-			sql.WaitForWritingDatabase()
-		}
+		sql.FlushQueue()
 		refreshDynamicRefText(node, tree)
 	}()
 	return
diff --git a/kernel/model/bookmark.go b/kernel/model/bookmark.go
index 17b10c751..85c119105 100644
--- a/kernel/model/bookmark.go
+++ b/kernel/model/bookmark.go
@@ -159,9 +159,7 @@ func BookmarkLabels() (ret []string) {
 
 func BuildBookmark() (ret *Bookmarks) {
 	WaitForWritingFiles()
-	if !sql.IsEmptyQueue() {
-		sql.WaitForWritingDatabase()
-	}
+	sql.FlushQueue()
 
 	ret = &Bookmarks{}
 	sqlBlocks := sql.QueryBookmarkBlocks()
diff --git a/kernel/model/box.go b/kernel/model/box.go
index c8eb0c34b..292604ce3 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -606,7 +606,7 @@ func FullReindex() {
 	task.AppendTask(task.DatabaseIndexFull, fullReindex)
 	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
 	go func() {
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 		ResetVirtualBlockRefCache()
 	}()
 	task.AppendTaskWithTimeout(task.DatabaseIndexEmbedBlock, 30*time.Second, autoIndexEmbedBlock)
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index 3b15262b2..a8971a5c7 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -612,7 +612,7 @@ func Close(force, setCurrentWorkspace bool, execInstallPkg int) (exitCode int) {
 	closeUserGuide()
 
 	// Improve indexing completeness when exiting https://github.com/siyuan-note/siyuan/issues/12039
-	sql.WaitForWritingDatabaseIn(200 * time.Millisecond)
+	sql.FlushQueue()
 
 	util.IsExiting.Store(true)
 	waitSecondForExecInstallPkg := false
diff --git a/kernel/model/history.go b/kernel/model/history.go
index a8e5b2edd..fcb576944 100644
--- a/kernel/model/history.go
+++ b/kernel/model/history.go
@@ -295,7 +295,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
 	}
 
 	go func() {
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 
 		tree, _ = LoadTreeByBlockID(id)
 		if nil == tree {
diff --git a/kernel/model/index.go b/kernel/model/index.go
index 1b7eccbcd..c702c5c7c 100644
--- a/kernel/model/index.go
+++ b/kernel/model/index.go
@@ -107,7 +107,7 @@ func listSyFiles(dir string) (ret []string) {
 func (box *Box) Unindex() {
 	task.AppendTask(task.DatabaseIndex, unindex, box.ID)
 	go func() {
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 		ResetVirtualBlockRefCache()
 	}()
 }
@@ -123,7 +123,7 @@ func (box *Box) Index() {
 	task.AppendTask(task.DatabaseIndex, index, box.ID)
 	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
 	go func() {
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 		ResetVirtualBlockRefCache()
 	}()
 }
diff --git a/kernel/model/index_fix.go b/kernel/model/index_fix.go
index 5c46b15fe..323c62ee0 100644
--- a/kernel/model/index_fix.go
+++ b/kernel/model/index_fix.go
@@ -50,15 +50,15 @@ func checkIndex() {
 		logging.LogInfof("start checking index...")
 
 		task.AppendTask(task.DatabaseIndexFix, removeDuplicateDatabaseIndex)
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 
 		task.AppendTask(task.DatabaseIndexFix, resetDuplicateBlocksOnFileSys)
 
 		task.AppendTask(task.DatabaseIndexFix, fixBlockTreeByFileSys)
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 
 		task.AppendTask(task.DatabaseIndexFix, fixDatabaseIndexByBlockTree)
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 
 		task.AppendTask(task.DatabaseIndexFix, removeDuplicateDatabaseRefs)
 
diff --git a/kernel/model/push_reload.go b/kernel/model/push_reload.go
index 961b71b71..93bd457b4 100644
--- a/kernel/model/push_reload.go
+++ b/kernel/model/push_reload.go
@@ -140,7 +140,7 @@ func refreshProtyle(rootID string) {
 
 // refreshRefCount 用于刷新定义块处的引用计数。
 func refreshRefCount(rootID, blockID string) {
-	sql.WaitForWritingDatabase()
+	sql.FlushQueue()
 
 	bt := treenode.GetBlockTree(blockID)
 	if nil == bt {
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 2a90aadec..0a692eaa8 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -660,7 +660,7 @@ func checkoutRepo(id string) {
 	task.AppendTask(task.DatabaseIndexFull, fullReindex)
 	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
 	go func() {
-		sql.WaitForWritingDatabase()
+		sql.FlushQueue()
 		ResetVirtualBlockRefCache()
 	}()
 	task.AppendTask(task.ReloadUI, util.ReloadUIResetScroll)
diff --git a/kernel/model/search.go b/kernel/model/search.go
index 1dbc3cd3f..cd7258860 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -791,14 +791,14 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
 		util.PushEndlessProgress(fmt.Sprintf(Conf.Language(207), i+1, len(renameRoots)))
 	}
 
-	sql.WaitForWritingDatabase()
+	sql.FlushQueue()
 
 	reloadTreeIDs = gulu.Str.RemoveDuplicatedElem(reloadTreeIDs)
 	for _, id := range reloadTreeIDs {
 		refreshProtyle(id)
 	}
 
-	sql.WaitForWritingDatabase()
+	sql.FlushQueue()
 	util.PushClearProgress()
 	return
 }
diff --git a/kernel/model/tag.go b/kernel/model/tag.go
index 8a84cdd48..43970d89b 100644
--- a/kernel/model/tag.go
+++ b/kernel/model/tag.go
@@ -207,10 +207,7 @@ type Tags []*Tag
 
 func BuildTags() (ret *Tags) {
 	WaitForWritingFiles()
-
-	if !sql.IsEmptyQueue() {
-		sql.WaitForWritingDatabase()
-	}
+	sql.FlushQueue()
 
 	ret = &Tags{}
 	labels := labelTags()
diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index 1433c6673..19c05849e 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -1532,7 +1532,7 @@ func updateRefTextRenameDoc(renamedTree *parse.Tree) {
 }
 
 func FlushUpdateRefTextRenameDocJob() {
-	sql.WaitForWritingDatabase()
+	sql.FlushQueue()
 	flushUpdateRefTextRenameDoc()
 }
 
diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go
index 7f683221e..460e88426 100644
--- a/kernel/sql/queue.go
+++ b/kernel/sql/queue.go
@@ -58,44 +58,6 @@ func FlushTxJob() {
 	task.AppendTask(task.DatabaseIndexCommit, FlushQueue)
 }
 
-func WaitForWritingDatabase() {
-	var printLog bool
-	var lastPrintLog bool
-	for i := 0; isWritingDatabase(util.SQLFlushInterval + 50*time.Millisecond); i++ {
-		time.Sleep(50 * time.Millisecond)
-		if 200 < i && !printLog { // 10s 后打日志
-			logging.LogWarnf("database is writing: \n%s", logging.ShortStack())
-			printLog = true
-		}
-		if 1200 < i && !lastPrintLog { // 60s 后打日志
-			logging.LogWarnf("database is still writing")
-			lastPrintLog = true
-		}
-	}
-}
-
-func WaitForWritingDatabaseIn(duration time.Duration) {
-	for i := 0; isWritingDatabase(duration); i++ {
-		time.Sleep(50 * time.Millisecond)
-	}
-}
-
-func isWritingDatabase(d time.Duration) bool {
-	time.Sleep(d)
-	dbQueueLock.Lock()
-	defer dbQueueLock.Unlock()
-	if 0 < len(operationQueue) || isWriting {
-		return true
-	}
-	return false
-}
-
-func IsEmptyQueue() bool {
-	dbQueueLock.Lock()
-	defer dbQueueLock.Unlock()
-	return 1 > len(operationQueue)
-}
-
 func ClearQueue() {
 	dbQueueLock.Lock()
 	defer dbQueueLock.Unlock()