diff --git a/web/database/utils/store.js b/web/database/utils/store.js
--- a/web/database/utils/store.js
+++ b/web/database/utils/store.js
@@ -9,6 +9,7 @@
   StoreOperations,
 } from 'lib/types/store-ops-types.js';
 
+import { defaultWebState } from '../../redux/default-state.js';
 import { workerRequestMessageTypes } from '../../types/worker-types.js';
 import { getDatabaseModule } from '../database-module-provider.js';
 
@@ -22,7 +23,7 @@
     messageStoreThreads: null,
     reports: null,
     users: null,
-    keyserverInfos: null,
+    keyserverInfos: defaultWebState.keyserverStore.keyserverInfos,
   };
   const data = await databaseModule.schedule({
     type: workerRequestMessageTypes.GET_CLIENT_STORE,
@@ -49,7 +50,7 @@
       },
     };
   }
-  if (data?.store?.keyservers) {
+  if (data?.store?.keyservers && data?.store.keyservers.length) {
     result = {
       ...result,
       keyserverInfos: keyserverStoreOpsHandlers.translateClientDBData(