diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 5e86e5cce..7d579a5d9 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -180,7 +180,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
     self.view.backgroundColor = [UIColor whiteColor];
 
     // TODO: Remove this.
-    [SignalApp.sharedApp setHomeViewController:self];
+    if (self.homeViewMode == HomeViewMode_Inbox) {
+        [SignalApp.sharedApp setHomeViewController:self];
+    }
 
     ReminderView *archiveReminderView =
         [ReminderView explanationWithText:NSLocalizedString(@"INBOX_VIEW_ARCHIVE_MODE_REMINDER",