diff --git a/web/selectors/tunnelbroker-selectors.js b/web/selectors/tunnelbroker-selectors.js
--- a/web/selectors/tunnelbroker-selectors.js
+++ b/web/selectors/tunnelbroker-selectors.js
@@ -8,7 +8,7 @@
 
 export const createTunnelbrokerInitMessage: AppState => ?ConnectionInitializationMessage =
   createSelector(
-    state => state.cryptoStore?.primaryIdentityKeys.ed25519,
+    state => state.cryptoStore?.primaryIdentityKeys?.ed25519,
     state => state.commServicesAccessToken,
     state => state.currentUserInfo?.id,
     (