diff --git a/kernel/model/backup.go b/kernel/model/backup.go
index 2daa7be13..d11fb8688 100644
--- a/kernel/model/backup.go
+++ b/kernel/model/backup.go
@@ -252,8 +252,10 @@ func CreateLocalBackup() (err error) {
 	defer util.ClearPushProgress(100)
 	util.PushEndlessProgress(Conf.Language(22))
 
+	writingDataLock.Lock()
+	defer writingDataLock.Unlock()
 	WaitForWritingFiles()
-
+	sql.WaitForWritingDatabase()
 	filesys.ReleaseAllFileLocks()
 
 	util.LogInfof("creating backup...")
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 5d4d648cb..911ae83e6 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -192,14 +192,12 @@ func IndexRepo(memo string) (err error) {
 		return
 	}
 
+	util.PushEndlessProgress(Conf.Language(143))
 	writingDataLock.Lock()
 	defer writingDataLock.Unlock()
-	util.PushEndlessProgress(Conf.Language(143))
 	WaitForWritingFiles()
 	sql.WaitForWritingDatabase()
 	filesys.ReleaseAllFileLocks()
-	CloseWatchAssets()
-	defer WatchAssets()
 
 	_, err = repo.Index(memo, util.PushEndlessProgress, indexCallbacks)
 	util.PushClearProgress()