diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -32,6 +32,7 @@
 import { TunnelbrokerDeviceTokenHandler } from 'lib/handlers/tunnelbroker-device-token-handler.react.js';
 import { UserInfosHandler } from 'lib/handlers/user-infos-handler.react.js';
 import { IdentitySearchProvider } from 'lib/identity-search/identity-search-context.js';
+import KeyserverConnectionsHandler from 'lib/keyserver-conn/keyserver-connections-handler.js';
 import {
   createLoadingStatusSelector,
   combineLoadingStatuses,
@@ -92,6 +93,7 @@
 import KeyserverSelectionList from './settings/keyserver-selection-list.react.js';
 import { getCommSharedWorker } from './shared-worker/shared-worker-provider.js';
 import CommunityPicker from './sidebar/community-picker.react.js';
+import Socket from './socket.react.js';
 import Splash from './splash/splash.react.js';
 import './typography.css';
 import css from './style.css';
@@ -593,6 +595,7 @@
                   />
                 </SecondaryDeviceQRAuthContextProvider>
                 <DBOpsHandler />
+                <KeyserverConnectionsHandler socketComponent={Socket} />
               </IdentitySearchProvider>
             </TunnelbrokerProvider>
           </NeynarClientProvider>
diff --git a/web/root.js b/web/root.js
--- a/web/root.js
+++ b/web/root.js
@@ -16,7 +16,6 @@
 import ReportHandler from 'lib/components/report-handler.react.js';
 import { UserIdentityCacheProvider } from 'lib/components/user-identity-cache.react.js';
 import { CallKeyserverEndpointProvider } from 'lib/keyserver-conn/call-keyserver-endpoint-provider.react.js';
-import KeyserverConnectionsHandler from 'lib/keyserver-conn/keyserver-connections-handler.js';
 import { reduxLoggerMiddleware } from 'lib/utils/action-logger.js';
 import { getWagmiConfig } from 'lib/utils/wagmi-utils.js';
 
@@ -34,7 +33,6 @@
 import history from './router-history.js';
 import { SQLiteDataHandler } from './shared-worker/sqlite-data-handler.js';
 import { localforageConfig } from './shared-worker/utils/constants.js';
-import Socket from './socket.react.js';
 
 localforage.config(localforageConfig);
 
@@ -73,7 +71,6 @@
                   <Router history={history.getHistoryObject()}>
                     <Route path="*" component={App} />
                   </Router>
-                  <KeyserverConnectionsHandler socketComponent={Socket} />
                   <PrekeysHandler />
                   <SQLiteDataHandler />
                   <IntegrityHandler />