diff --git a/js/background.js b/js/background.js
index 29dbf195e..b837a8f44 100644
--- a/js/background.js
+++ b/js/background.js
@@ -587,7 +587,10 @@
     if (Whisper.Import.isIncomplete()) {
       window.log.info('Import was interrupted, showing import error screen');
       appView.openImporter();
-    } else if (Whisper.Registration.everDone()) {
+    } else if (
+      Whisper.Registration.everDone() &&
+      !Whisper.Registration.ongoingSecondaryDeviceRegistration()
+    ) {
       // listeners
       Whisper.RotateSignedPreKeyListener.init(Whisper.events, newVersion);
       // window.Signal.RefreshSenderCertificate.initialize({
diff --git a/js/registration.js b/js/registration.js
index 499e981bf..301e8cb88 100644
--- a/js/registration.js
+++ b/js/registration.js
@@ -21,6 +21,9 @@
         storage.get('chromiumRegistrationDone') === ''
       );
     },
+    ongoingSecondaryDeviceRegistration() {
+      return storage.get('secondaryDeviceStatus') === 'ongoing';
+    },
     remove() {
       storage.remove('chromiumRegistrationDone');
     },