diff --git a/lib/components/secondary-device-qr-auth-context-provider.react.js b/lib/components/secondary-device-qr-auth-context-provider.react.js
--- a/lib/components/secondary-device-qr-auth-context-provider.react.js
+++ b/lib/components/secondary-device-qr-auth-context-provider.react.js
@@ -75,7 +75,9 @@
     closeSecondaryQRAuth: () => {},
     canGenerateQRs: true,
     qrAuthInProgress: false,
-    registerErrorListener: () => ({ remove: () => {} }),
+    registerErrorListener: () => ({
+      remove: () => {},
+    }),
   });
 
 function SecondaryDeviceQRAuthContextProvider(props: Props): React.Node {
@@ -329,8 +331,8 @@
       }
 
       const identityAuthResult = await performLogIn(userID);
-      await restoreUserData(backupData, identityAuthResult);
       setUnauthorizedDeviceID(null);
+      await restoreUserData(backupData, identityAuthResult);
     },
     [
       identityClient,