diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 8974bd59a..17332bce7 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -928,6 +928,9 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
         [mvc configureForThread:thread action:action];
         self.lastThread = thread;
 
+        // Never push more than one conversation view controller at a time.
+        [self.navigationController popToViewController:self animated:NO];
+
         [self pushTopLevelViewController:mvc animateDismissal:YES animatePresentation:YES];
     });
 }