diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 4683a901b..cadb5dcb2 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -880,6 +880,13 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
                                                                                  withMappings:self.threadMappings];
     }];
 
+    static BOOL hasIncrementedDatabaseView = NO;
+    if (![thread isKindOfClass:[TSThread class]] && !hasIncrementedDatabaseView) {
+        OWSLogError(@"Invalid object in thread view: %@", [thread class]);
+        [OWSStorage incrementVersionOfDatabaseExtension:TSThreadDatabaseViewExtensionName];
+        hasIncrementedDatabaseView = YES;
+    }
+
     return thread;
 }