diff --git a/lib/keyserver-conn/recovery-utils.js b/lib/keyserver-conn/recovery-utils.js
--- a/lib/keyserver-conn/recovery-utils.js
+++ b/lib/keyserver-conn/recovery-utils.js
@@ -65,6 +65,7 @@
   urlPrefix: string,
   recoveryActionSource: RecoveryActionSource,
   keyserverID: string,
+  userStateBeforeRecovery: PreRequestUserState,
   actionFunc: (
     callSingleKeyserverEndpoint: CallSingleKeyserverEndpoint,
     callKeyserverEndpoint: CallKeyserverEndpoint,
@@ -84,7 +85,7 @@
       setNewSession(
         dispatch,
         sessionChange,
-        null,
+        userStateBeforeRecovery,
         error,
         recoveryActionSource,
         keyserverID,
@@ -225,6 +226,7 @@
           urlPrefix,
           source,
           keyserverID,
+          userStateBeforeRecovery,
           actionFunc,
         );
         const sessionChange =