diff --git a/lib/actions/user-actions.js b/lib/actions/user-actions.js
--- a/lib/actions/user-actions.js
+++ b/lib/actions/user-actions.js
@@ -579,8 +579,6 @@
         keyserverAuthCallSingleKeyserverEndpointOptions,
       );
 
-    const userInfosArrays = [];
-
     let threadInfos: RawThreadInfos = {};
     const calendarResult: WritableCalendarResult = {
       calendarQuery: keyserverAuthInfo.calendarQuery,
@@ -618,10 +616,13 @@
         ...updatesCurrentAsOf,
         [keyserverID]: responses[keyserverID].serverTime,
       };
-      userInfosArrays.push(responses[keyserverID].userInfos);
-      userInfosArrays.push(responses[keyserverID].cookieChange.userInfos);
     }
 
+    const userInfosArrays = [
+      responses[authoritativeKeyserverID()].userInfos,
+      responses[authoritativeKeyserverID()].cookieChange.userInfos,
+    ];
+
     const userInfos = mergeUserInfos(...userInfosArrays);
 
     return {
diff --git a/lib/reducers/user-reducer.js b/lib/reducers/user-reducer.js
--- a/lib/reducers/user-reducer.js
+++ b/lib/reducers/user-reducer.js
@@ -374,7 +374,10 @@
       [],
       userStoreOps,
     ];
-  } else if (action.type === keyserverAuthActionTypes.success) {
+  } else if (
+    action.type === keyserverAuthActionTypes.success &&
+    relyingOnAuthoritativeKeyserver
+  ) {
     const newUserInfos = _keyBy(userInfo => userInfo.id)(
       action.payload.userInfos,
     );