diff --git a/lib/components/keyserver-connection-handler.js b/lib/components/keyserver-connection-handler.js
--- a/lib/components/keyserver-connection-handler.js
+++ b/lib/components/keyserver-connection-handler.js
@@ -1,5 +1,6 @@
 // @flow
 
+import invariant from 'invariant';
 import * as React from 'react';
 
 import { logOutActionTypes, useLogOut } from '../actions/user-actions.js';
@@ -35,6 +36,8 @@
   const identityClient = React.useContext(
     IdentityClientContext,
   )?.identityClient;
+  invariant(identityClient, 'Identity client should be set');
+
   React.useEffect(() => {
     if (!usingCommServicesAccessToken) {
       return;
@@ -42,7 +45,7 @@
 
     void (async () => {
       try {
-        await identityClient?.getKeyserverKeys(keyserverID);
+        await identityClient.getKeyserverKeys(keyserverID);
       } catch (e) {
         console.log(
           `Error getting keys for keyserver with id ${keyserverID}`,