diff --git a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m
index 868665a4b2..2afcbc2eb7 100644
--- a/Signal/src/ViewControllers/HomeView/ConversationListViewController.m
+++ b/Signal/src/ViewControllers/HomeView/ConversationListViewController.m
@@ -756,7 +756,7 @@ NSString *const kArchiveButtonPseudoGroup = @"kArchiveButtonPseudoGroup";
 {
     [super viewDidAppear:animated];
 
-    if (![ExperienceUpgradeManager presentNextFromViewController:self]) {
+    if (!self.hasEverAppeared && ![ExperienceUpgradeManager presentNextFromViewController:self]) {
         [OWSActionSheets showIOSUpgradeNagIfNecessary];
     }
 
@@ -1183,6 +1183,10 @@ NSString *const kArchiveButtonPseudoGroup = @"kArchiveButtonPseudoGroup";
 - (void)applicationDidBecomeActive:(NSNotification *)notification
 {
     [self updateShouldObserveDBModifications];
+
+    if (![ExperienceUpgradeManager presentNextFromViewController:self]) {
+        [OWSActionSheets showIOSUpgradeNagIfNecessary];
+    }
 }
 
 - (void)applicationWillResignActive:(NSNotification *)notification