diff --git a/client/package-lock.json b/client/package-lock.json
index 1cb07ad7..14e427aa 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/client/package.json b/client/package.json
index 111b45a2..703ef45a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
   "scripts": {
diff --git a/package-lock.json b/package-lock.json
index 76046f1e..5328c9aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 826a2526..5687fd94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",
   "scripts": {
diff --git a/server/Database.js b/server/Database.js
index f87dc031..a959d0a9 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -156,7 +156,7 @@ class Database {
     await this.buildModels(force)
     Logger.info(`[Database] Db initialized with models:`, Object.keys(this.sequelize.models).join(', '))
 
-    await this.cleanDatabase()
+
     await this.loadData()
   }
 
@@ -268,6 +268,8 @@ class Database {
       await dbMigration.migrationPatch2(this)
     }
 
+    await this.cleanDatabase()
+
     // Set if root user has been created
     this.hasRootUser = await this.models.user.getHasRootUser()