diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx
index 79efc3f58..23840df9a 100644
--- a/ts/components/session/RegistrationTabs.tsx
+++ b/ts/components/session/RegistrationTabs.tsx
@@ -124,11 +124,12 @@ export class RegistrationTabs extends React.Component<{}, State> {
 
     this.accountManager = window.getAccountManager();
     // Clean status in case the app closed unexpectedly
-    window.textsecure.storage.remove('secondaryDeviceStatus');
   }
 
   public componentDidMount() {
     this.generateMnemonicAndKeyPair().ignore();
+    window.textsecure.storage.remove('secondaryDeviceStatus');
+    this.resetRegistration().ignore();
   }
 
   public render() {