diff --git a/package/src/components/Chat/hooks/useAppSettings.ts b/package/src/components/Chat/hooks/useAppSettings.ts
index d18cad70df..e3643a596d 100644
--- a/package/src/components/Chat/hooks/useAppSettings.ts
+++ b/package/src/components/Chat/hooks/useAppSettings.ts
@@ -19,9 +19,7 @@ export const useAppSettings = <
     async function enforeAppSettings() {
       if (!client.userID) return;
 
-      if (enableOfflineSupport && !initialisedDatabase.initialised) return;
-
-      if (enableOfflineSupport && initialisedDatabase.userID !== client.userID) return;
+      if (enableOfflineSupport && !initialisedDatabase) return;
 
       if (!isOnline && enableOfflineSupport) {
         const appSettings = dbApi.getAppSettings({ currentUserId: client.userID });