diff --git a/kernel/cache/tree.go b/kernel/cache/tree.go
index 836d2149a..4645436b0 100644
--- a/kernel/cache/tree.go
+++ b/kernel/cache/tree.go
@@ -52,3 +52,7 @@ func SetTreeData(rootID string, raw []byte) {
 func RemoveTreeData(rootID string) {
 	treeCache.Del(rootID)
 }
+
+func ClearTreeCache() {
+	treeCache.Clear()
+}
diff --git a/kernel/model/box.go b/kernel/model/box.go
index d294b7d21..7530c6be6 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -797,6 +797,10 @@ func VacuumDataIndex() {
 }
 
 func FullReindex() {
+	cache.ClearTreeCache()
+	cache.ClearDocsIAL()
+	cache.ClearBlocksIAL()
+
 	task.AppendTask(task.DatabaseIndexFull, fullReindex)
 	task.AppendTask(task.DatabaseIndexRef, IndexRefs)
 	go func() {
@@ -804,8 +808,6 @@ func FullReindex() {
 		ResetVirtualBlockRefCache()
 	}()
 	task.AppendTaskWithTimeout(task.DatabaseIndexEmbedBlock, 30*time.Second, autoIndexEmbedBlock)
-	cache.ClearDocsIAL()
-	cache.ClearBlocksIAL()
 	task.AppendTask(task.ReloadUI, util.ReloadUI)
 }