diff --git a/lib/reducers/master-reducer.js b/lib/reducers/master-reducer.js
index 3dc6f8e587..114c3b05c7 100644
--- a/lib/reducers/master-reducer.js
+++ b/lib/reducers/master-reducer.js
@@ -22,6 +22,7 @@ import reduceGlobalThemeInfo from './theme-reducer.js';
 import { reduceThreadActivity } from './thread-activity-reducer.js';
 import { reduceThreadInfos } from './thread-reducer.js';
 import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
+import { addKeyserverActionType } from '../actions/keyserver-actions.js';
 import { siweAuthActionTypes } from '../actions/siwe-actions.js';
 import {
   registerActionTypes,
@@ -82,7 +83,8 @@ export default function baseReducer<N: BaseNavInfo, T: BaseAppState<N>>(
     action.type !== fullStateSyncActionType &&
     action.type !== registerActionTypes.success &&
     action.type !== logInActionTypes.success &&
-    action.type !== siweAuthActionTypes.success
+    action.type !== siweAuthActionTypes.success &&
+    action.type !== addKeyserverActionType
   ) {
     for (const keyserverID in keyserverStore.keyserverInfos) {
       if (
@@ -104,8 +106,9 @@ export default function baseReducer<N: BaseNavInfo, T: BaseAppState<N>>(
         };
       }
       if (
+        state.keyserverStore.keyserverInfos[keyserverID] &&
         keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
-        state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
+          state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
       ) {
         const keyserverInfos = { ...keyserverStore.keyserverInfos };
         keyserverInfos[keyserverID] = {
diff --git a/lib/socket/socket.react.js b/lib/socket/socket.react.js
index e6bf2467f1..840ca5b0b5 100644
--- a/lib/socket/socket.react.js
+++ b/lib/socket/socket.react.js
@@ -509,6 +509,7 @@ class Socket extends React.PureComponent<Props, State> {
             error: null,
             logInActionSource:
               logInActionSources.socketAuthErrorResolutionAttempt,
+            keyserverID: ashoatKeyserverID,
           },
         });
       } else if (!recoverySessionChange) {