diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
index 2c32b90d30..05fa5539a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
@@ -27,6 +27,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.devicelist.Device;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
@@ -106,7 +107,9 @@ public class DeviceListFragment extends ListFragment
     if (data.isEmpty()) {
       empty.setVisibility(View.VISIBLE);
       TextSecurePreferences.setMultiDevice(getActivity(), false);
+      SignalStore.misc().setShouldShowLinkedDevicesReminder(false);
     } else {
+      SignalStore.misc().setShouldShowLinkedDevicesReminder(true);
       empty.setVisibility(View.GONE);
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt
index 8caf9277d7..d68879f352 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt
@@ -40,8 +40,8 @@ class RegistrationCompleteFragment : LoggingFragment() {
     val activity = requireActivity()
     val viewModel: RegistrationViewModel by viewModels(ownerProducer = { requireActivity() })
 
-    if (viewModel.isReregister) {
-      SignalStore.misc().shouldShowLinkedDevicesReminder = true
+    if (SignalStore.misc().shouldShowLinkedDevicesReminder) {
+      SignalStore.misc().shouldShowLinkedDevicesReminder = viewModel.isReregister
     }
 
     if (SignalStore.storageService().needsAccountRestore()) {