diff --git a/lib/socket/request-response-handler.react.js b/lib/socket/request-response-handler.react.js
--- a/lib/socket/request-response-handler.react.js
+++ b/lib/socket/request-response-handler.react.js
@@ -21,7 +21,6 @@
   type SocketListener,
   type ConnectionInfo,
 } from '../types/socket-types.js';
-import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
 import { ServerError, SocketTimeout } from '../utils/errors.js';
 import { useSelector, useDispatch } from '../utils/redux-utils.js';
 
@@ -141,9 +140,7 @@
 
 const ConnectedRequestResponseHandler: React.ComponentType<BaseProps> =
   React.memo<BaseProps>(function ConnectedRequestResponseHandler(props) {
-    const connection = useSelector(
-      connectionSelector(authoritativeKeyserverID()),
-    );
+    const connection = useSelector(connectionSelector(props.keyserverID));
     invariant(connection, 'keyserver missing from keyserverStore');
 
     const dispatch = useDispatch();