diff --git a/src/service/database/tableFixes.js b/src/service/database/tableFixes.js
index dafb0cad..b972aed1 100644
--- a/src/service/database/tableFixes.js
+++ b/src/service/database/tableFixes.js
@@ -4,11 +4,17 @@ import sqliteService from '../sqlite.js';
 
 const tableFixes = {
     async cleanLegendFromFriendLog() {
-        await sqliteService.executeNonQuery(
-            `DELETE FROM ${dbVars.userPrefix}_friend_log_history
-            WHERE type = 'TrustLevel' AND created_at > '2022-05-04T01:00:00.000Z'
-            AND ((trust_level = 'Veteran User' AND previous_trust_level = 'Trusted User') OR (trust_level = 'Trusted User' AND previous_trust_level = 'Veteran User'))`
-        );
+        var tables = [];
+        await sqliteService.execute((dbRow) => {
+            tables.push(dbRow[0]);
+        }, `SELECT name FROM sqlite_schema WHERE type='table' AND name LIKE '%_friend_log_history'`);
+        for (var tableName of tables) {
+            await sqliteService.executeNonQuery(
+                `DELETE FROM ${tableName}
+                WHERE type = 'TrustLevel' AND created_at > '2022-05-04T01:00:00.000Z'
+                AND ((trust_level = 'Veteran User' AND previous_trust_level = 'Trusted User') OR (trust_level = 'Trusted User' AND previous_trust_level = 'Veteran User'))`
+            );
+        }
     },
 
     async fixGameLogTraveling() {
@@ -111,21 +117,39 @@ const tableFixes = {
     },
 
     async fixBrokenNotifications() {
-        await sqliteService.executeNonQuery(
-            `DELETE FROM ${dbVars.userPrefix}_notifications WHERE (created_at is null or created_at = '')`
-        );
+        var tables = [];
+        await sqliteService.execute((dbRow) => {
+            tables.push(dbRow[0]);
+        }, `SELECT name FROM sqlite_schema WHERE type='table' AND name LIKE '%_notifications'`);
+        for (var tableName of tables) {
+            await sqliteService.executeNonQuery(
+                `DELETE FROM ${tableName} WHERE (created_at is null or created_at = '')`
+            );
+        }
     },
 
     async fixBrokenGroupChange() {
-        await sqliteService.executeNonQuery(
-            `DELETE FROM ${dbVars.userPrefix}_notifications WHERE type = 'groupChange' AND created_at < '2024-04-23T03:00:00.000Z'`
-        );
+        var tables = [];
+        await sqliteService.execute((dbRow) => {
+            tables.push(dbRow[0]);
+        }, `SELECT name FROM sqlite_schema WHERE type='table' AND name LIKE '%_notifications'`);
+        for (var tableName of tables) {
+            await sqliteService.executeNonQuery(
+                `DELETE FROM ${tableName} WHERE type = 'groupChange' AND created_at < '2024-04-23T03:00:00.000Z'`
+            );
+        }
     },
 
     async fixCancelFriendRequestTypo() {
-        await sqliteService.executeNonQuery(
-            `UPDATE ${dbVars.userPrefix}_friend_log_history SET type = 'CancelFriendRequest' WHERE type = 'CancelFriendRequst'`
-        );
+        var tables = [];
+        await sqliteService.execute((dbRow) => {
+            tables.push(dbRow[0]);
+        }, `SELECT name FROM sqlite_schema WHERE type='table' AND name LIKE '%_friend_log_history'`);
+        for (var tableName of tables) {
+            await sqliteService.executeNonQuery(
+                `UPDATE ${tableName} SET type = 'CancelFriendRequest' WHERE type = 'CancelFriendRequst'`
+            );
+        }
     },
 
     async getBrokenGameLogDisplayNames() {
diff --git a/src/stores/auth.js b/src/stores/auth.js
index 4fa95f36..c31acb70 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -885,7 +885,6 @@ export const useAuthStore = defineStore('Auth', () => {
         await database.initUserTables(userStore.currentUser.id);
         watchState.isLoggedIn = true;
         AppApi.CheckGameRunning(); // restore state from hot-reload
-        vrcxStore.updateDatabaseVersion();
     }
 
     return {
diff --git a/src/stores/vrcx.js b/src/stores/vrcx.js
index ae8a0a5c..9694bb2f 100644
--- a/src/stores/vrcx.js
+++ b/src/stores/vrcx.js
@@ -103,6 +103,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
             'VRCX_databaseVersion',
             0
         );
+        updateDatabaseVersion();
 
         clearVRCXCacheFrequency.value = await configRepository.getInt(
             'VRCX_clearVRCXCacheFrequency',
@@ -193,7 +194,7 @@ export const useVrcxStore = defineStore('Vrcx', () => {
 
     async function updateDatabaseVersion() {
         // requires dbVars.userPrefix to be already set
-        const databaseVersion = 12;
+        const databaseVersion = 13;
         let msgBox;
         if (state.databaseVersion < databaseVersion) {
             if (state.databaseVersion) {