diff --git a/kernel/model/box.go b/kernel/model/box.go
index 9be24e3b8..450d9014b 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -393,7 +393,9 @@ func moveTree(tree *parse.Tree) {
 		tree.Root.RemoveIALAttr("custom-hidden")
 		filesys.WriteTree(tree)
 	}
-	sql.UpsertTreeQueue(tree)
+
+	sql.RemoveTreeQueue(tree.ID)
+	sql.IndexTreeQueue(tree)
 
 	box := Conf.Box(tree.Box)
 	box.renameSubTrees(tree)