diff --git a/lib/utils/keyserver-call.js b/lib/utils/keyserver-call.js
--- a/lib/utils/keyserver-call.js
+++ b/lib/utils/keyserver-call.js
@@ -72,11 +72,14 @@
   keyserverID: string,
 ) => BindServerCallsParams => CallServerEndpoint;
 const createBoundServerCallsSelector: CreateBoundServerCallsSelectorType =
-  (_memoize(baseCreateBoundServerCallsSelector): any);
+  _memoize(baseCreateBoundServerCallsSelector);
 
-export type KeyserverInfoPartial = $Shape<KeyserverInfo>;
+type KeyserverInfoPartial = $ReadOnly<{
+  ...Partial<KeyserverInfo>,
+  +urlPrefix: $PropertyType<KeyserverInfo, 'urlPrefix'>,
+}>;
 
-export type BindKeyserverCallParams = {
+type BindKeyserverCallParams = {
   +dispatch: Dispatch,
   +currentUserInfo: ?CurrentUserInfo,
   +keyserverInfos: { +[keyserverID: string]: KeyserverInfoPartial },
@@ -94,7 +97,7 @@
   (
     dispatch: Dispatch,
     currentUserInfo: ?CurrentUserInfo,
-    keyserverInfos: { +[keyserverID: string]: KeyserverInfo },
+    keyserverInfos: { +[keyserverID: string]: KeyserverInfoPartial },
   ) => {
     return _memoize(
       <Args: mixed, Return>(
@@ -122,7 +125,7 @@
               cookie,
               urlPrefix,
               sessionID,
-              connectionStatus: connection?.status,
+              connectionStatus: connection?.status ?? 'disconnected',
               lastCommunicatedPlatformDetails,
               keyserverID,
             });