diff --git a/SignalServiceKit/src/Storage/Database/Records/ThreadFinder.swift b/SignalServiceKit/src/Storage/Database/Records/ThreadFinder.swift
index 92b64a4b3e..039232ba89 100644
--- a/SignalServiceKit/src/Storage/Database/Records/ThreadFinder.swift
+++ b/SignalServiceKit/src/Storage/Database/Records/ThreadFinder.swift
@@ -87,12 +87,13 @@ struct GRDBThreadFinder: ThreadFinder {
             SELECT COUNT(*)
             FROM (
                 SELECT
+                    \( threadColumn: .shouldThreadBeVisible),
                     CASE maxInteractionId <= \(threadColumn: .archivedAsOfMessageSortId)
                         WHEN 1 THEN 1
                         ELSE 0
                     END isArchived
                 FROM \(ThreadRecord.databaseTableName)
-                INNER JOIN (
+                LEFT JOIN (
                     SELECT
                         MAX(\(interactionColumn: .id)) as maxInteractionId,
                         \(interactionColumn: .threadUniqueId)
@@ -102,6 +103,7 @@ struct GRDBThreadFinder: ThreadFinder {
                 ON latestInteractions.\(interactionColumn: .threadUniqueId) = \(threadColumn: .uniqueId)
             )
             WHERE isArchived = ?
+            AND \(threadColumn: .shouldThreadBeVisible) = 1
         """,
                                             arguments: [isArchived]) else {
                                                 owsFailDebug("count was unexpectedly nil")
@@ -122,7 +124,7 @@ struct GRDBThreadFinder: ThreadFinder {
                         ELSE 0
                     END isArchived
                 FROM \(ThreadRecord.databaseTableName)
-                INNER JOIN (
+                LEFT JOIN (
                     SELECT
                         MAX(\(interactionColumn: .id)) as maxInteractionId,
                         \(interactionColumn: .threadUniqueId)
@@ -133,6 +135,7 @@ struct GRDBThreadFinder: ThreadFinder {
                 ORDER BY maxInteractionId DESC
             )
             WHERE isArchived = ?
+            AND \( threadColumn: .shouldThreadBeVisible) = 1
         """,
                                      arguments: [isArchived]).forEach { threadRecord in
                                         block(try TSThread.fromRecord(threadRecord))
diff --git a/SignalServiceKit/src/Storage/TSDatabaseView.m b/SignalServiceKit/src/Storage/TSDatabaseView.m
index c914c21211..c07f6459c9 100644
--- a/SignalServiceKit/src/Storage/TSDatabaseView.m
+++ b/SignalServiceKit/src/Storage/TSDatabaseView.m
@@ -319,10 +319,12 @@ NSString *const TSLazyRestoreAttachmentsGroup = @"TSLazyRestoreAttachmentsGroup"
             OWSAssertDebug(viewTransaction);
             NSUInteger threadMessageCount = [viewTransaction numberOfItemsInGroup:thread.uniqueId];
             if (threadMessageCount < 1) {
+                OWSAssertDebug(!thread.shouldThreadBeVisible);
                 return nil;
             }
         }
 
+        OWSAssertDebug(thread.shouldThreadBeVisible);
         return [thread isArchivedWithTransaction:transaction.asAnyRead] ? TSArchiveGroup : TSInboxGroup;
     }];