diff --git a/lib/selectors/socket-selectors.js b/lib/selectors/socket-selectors.js
--- a/lib/selectors/socket-selectors.js
+++ b/lib/selectors/socket-selectors.js
@@ -95,6 +95,7 @@
 
 const getClientResponsesSelector: (
   state: AppState,
+  keyserverID: string,
 ) => (
   calendarActive: boolean,
   oneTimeKeyGenerator: ?OneTimeKeyGenerator,
@@ -106,9 +107,12 @@
 ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
   boundStateSyncSpecsSelector,
   currentCalendarQuery,
+  (state: AppState, keyserverID: string) => keyserverID,
   (
     boundStateSyncSpecs: BoundStateSyncSpecs,
     calendarQuery: (calendarActive: boolean) => CalendarQuery,
+    // eslint-disable-next-line no-unused-vars
+    keyserverID: string,
   ) => {
     return async (
       calendarActive: boolean,
diff --git a/native/selectors/socket-selectors.js b/native/selectors/socket-selectors.js
--- a/native/selectors/socket-selectors.js
+++ b/native/selectors/socket-selectors.js
@@ -59,12 +59,13 @@
   return signedIdentityKeysBlob;
 }
 
-type NativeGetClientResponsesSelectorInputType = {
+type NativeGetClientResponsesSelectorInputType = $ReadOnly<{
   ...NavPlusRedux,
   getInitialNotificationsEncryptedMessage: (
     keyserverID: string,
   ) => Promise<string>,
-};
+  keyserverID: string,
+}>;
 
 const nativeGetClientResponsesSelector: (
   input: NativeGetClientResponsesSelectorInputType,
@@ -72,7 +73,7 @@
   serverRequests: $ReadOnlyArray<ClientServerRequest>,
 ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
   (input: NativeGetClientResponsesSelectorInputType) =>
-    getClientResponsesSelector(input.redux),
+    getClientResponsesSelector(input.redux, input.keyserverID),
   (input: NativeGetClientResponsesSelectorInputType) =>
     calendarActiveSelector(input.navContext),
   (input: NativeGetClientResponsesSelectorInputType) =>
diff --git a/native/socket.react.js b/native/socket.react.js
--- a/native/socket.react.js
+++ b/native/socket.react.js
@@ -78,6 +78,7 @@
         redux: state,
         navContext,
         getInitialNotificationsEncryptedMessage,
+        keyserverID,
       }),
     );
     const sessionStateFunc = useSelector(state =>
diff --git a/web/selectors/socket-selectors.js b/web/selectors/socket-selectors.js
--- a/web/selectors/socket-selectors.js
+++ b/web/selectors/socket-selectors.js
@@ -48,6 +48,7 @@
   +getInitialNotificationsEncryptedMessage: (
     keyserverID: string,
   ) => Promise<string>,
+  +keyserverID: string,
 };
 
 const webGetClientResponsesSelector: (
@@ -56,7 +57,7 @@
   serverRequests: $ReadOnlyArray<ClientServerRequest>,
 ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
   (input: WebGetClientResponsesSelectorInputType) =>
-    getClientResponsesSelector(input.state),
+    getClientResponsesSelector(input.state, input.keyserverID),
   (input: WebGetClientResponsesSelectorInputType) =>
     input.getSignedIdentityKeysBlob,
   (input: WebGetClientResponsesSelectorInputType) =>
diff --git a/web/socket.react.js b/web/socket.react.js
--- a/web/socket.react.js
+++ b/web/socket.react.js
@@ -80,6 +80,7 @@
         state,
         getSignedIdentityKeysBlob,
         getInitialNotificationsEncryptedMessage,
+        keyserverID,
       }),
     );
     const sessionStateFunc = useSelector(