diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m
index 1b915de660..ad5cb610ac 100644
--- a/SignalServiceKit/src/Contacts/TSThread.m
+++ b/SignalServiceKit/src/Contacts/TSThread.m
@@ -189,13 +189,7 @@ isArchivedByLegacyTimestampForSorting:(BOOL)isArchivedByLegacyTimestampForSortin
 {
     [super anyDidInsertWithTransaction:transaction];
 
-    BOOL isLocalThread = NO;
-    if ([self isKindOfClass:[TSContactThread class]]) {
-        TSContactThread *contactThread = (TSContactThread *)self;
-        OWSAssertDebug(contactThread.contactAddress != nil);
-        isLocalThread = contactThread.contactAddress.isLocalAddress;
-    }
-    if (!isLocalThread && ![SSKPreferences hasSavedThreadWithTransaction:transaction]) {
+    if (self.shouldThreadBeVisible && ![SSKPreferences hasSavedThreadWithTransaction:transaction]) {
         [SSKPreferences setHasSavedThread:YES transaction:transaction];
     }
 }