diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m
index e86820e67..d6bcdb087 100644
--- a/SignalServiceKit/src/Contacts/TSThread.m
+++ b/SignalServiceKit/src/Contacts/TSThread.m
@@ -99,7 +99,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(interactionsByThread);
     [interactionsByThread enumerateKeysInGroup:self.uniqueId
                                     usingBlock:^(NSString *collection, NSString *key, NSUInteger index, BOOL *stop) {
-                                        if (key.length < 1) {
+                                        if (![key isKindOfClass:[NSString class]] || key.length < 1) {
                                             OWSProdLogAndFail(@"%@ invalid key in thread interactions.", self.logTag);
                                             return;
                                         }