diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 6b4b7cfb7..9b3b6d81c 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -376,6 +376,10 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
 {
     NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:location];
 
+    if ([self isIndexPathForArchivedConversations:indexPath]) {
+        return nil;
+    }
+
     if (indexPath) {
         [previewingContext setSourceRect:[self.tableView rectForRowAtIndexPath:indexPath]];
 
@@ -831,6 +835,10 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath
 {
+    if ([self isIndexPathForArchivedConversations:indexPath]) {
+        return NO;
+    }
+
     return YES;
 }