diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index ffa56f9d2..d2596e379 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -94,7 +94,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     _isGroupThread = isGroupThread;
     _conversationStyle = conversationStyle;
     _incomingMessageAuthorThread = ([interaction isKindOfClass:[TSIncomingMessage class]]
-            ? [TSContactThread getOrCreateThreadWithContactId:((TSIncomingMessage *)interaction).authorId]
+            ? [TSContactThread getThreadWithContactId:((TSIncomingMessage *)interaction).authorId
+                                          transaction:transaction]
             : nil);
 
     [self ensureViewState:transaction];
@@ -108,7 +109,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
 
     _interaction = interaction;
     _incomingMessageAuthorThread = ([interaction isKindOfClass:[TSIncomingMessage class]]
-            ? [TSContactThread getOrCreateThreadWithContactId:((TSIncomingMessage *)interaction).authorId]
+            ? [TSContactThread getThreadWithContactId:((TSIncomingMessage *)interaction).authorId
+                                          transaction:transaction]
             : nil);
 
     self.hasViewState = NO;