diff --git a/lib/keyserver-conn/keyserver-connection-handler.js b/lib/keyserver-conn/keyserver-connection-handler.js
--- a/lib/keyserver-conn/keyserver-connection-handler.js
+++ b/lib/keyserver-conn/keyserver-connection-handler.js
@@ -259,7 +259,7 @@
     cancelPendingRecovery.current?.();
     cancelPendingRecovery.current = null;
 
-    if (!hasAccessToken) {
+    if (!hasAccessToken || !hasCurrentUserInfo) {
       cancelPendingAuth.current?.();
       cancelPendingAuth.current = null;
     }
@@ -267,7 +267,9 @@
     if (
       !usingCommServicesAccessToken ||
       isUserLoggedInToKeyserver ||
-      !hasAccessToken
+      !hasAccessToken ||
+      !hasCurrentUserInfo ||
+      keyserverID === authoritativeKeyserverID()
     ) {
       return;
     }
@@ -289,6 +291,8 @@
     authInProgress,
     performRecovery,
     hasAccessToken,
+    hasCurrentUserInfo,
+    keyserverID,
     isUserLoggedInToKeyserver,
     canInitiateRecovery,
     performAuth,