diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index 0db01f9f6..4f9f482b7 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -2661,9 +2661,9 @@ typedef enum : NSUInteger {
 
     self.dynamicInteractions =
         [ThreadUtil ensureDynamicInteractionsForThread:self.thread
-                                        storageManager:self.storageManager
                                        contactsManager:self.contactsManager
                                        blockingManager:self.blockingManager
+                                          dbConnection:self.uiDatabaseConnection
                            hideUnreadMessagesIndicator:self.hasClearedUnreadMessagesIndicator
                        firstUnseenInteractionTimestamp:self.dynamicInteractions.firstUnseenInteractionTimestamp
                                           maxRangeSize:maxRangeSize];
diff --git a/Signal/src/util/ThreadUtil.h b/Signal/src/util/ThreadUtil.h
index 8d2e6b16f..1c4fd2b71 100644
--- a/Signal/src/util/ThreadUtil.h
+++ b/Signal/src/util/ThreadUtil.h
@@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class SignalAttachment;
 @class TSContactThread;
 @class TSInteraction;
-@class TSStorageManager;
+@class YapDatabaseConnection;
 @class TSThread;
 @class TSUnreadIndicatorInteraction;
 
@@ -73,9 +73,9 @@ NS_ASSUME_NONNULL_BEGIN
 //   size of the "load window" in that view. The unread indicator should
 //   always be inserted within that window.
 + (ThreadDynamicInteractions *)ensureDynamicInteractionsForThread:(TSThread *)thread
-                                                   storageManager:(TSStorageManager *)storageManager
                                                   contactsManager:(OWSContactsManager *)contactsManager
                                                   blockingManager:(OWSBlockingManager *)blockingManager
+                                                     dbConnection:(YapDatabaseConnection *)dbConnection
                                       hideUnreadMessagesIndicator:(BOOL)hideUnreadMessagesIndicator
                                   firstUnseenInteractionTimestamp:(nullable NSNumber *)firstUnseenInteractionTimestamp
                                                      maxRangeSize:(int)maxRangeSize;
diff --git a/Signal/src/util/ThreadUtil.m b/Signal/src/util/ThreadUtil.m
index 4d9714a5d..0739759d8 100644
--- a/Signal/src/util/ThreadUtil.m
+++ b/Signal/src/util/ThreadUtil.m
@@ -94,16 +94,16 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 + (ThreadDynamicInteractions *)ensureDynamicInteractionsForThread:(TSThread *)thread
-                                                   storageManager:(TSStorageManager *)storageManager
                                                   contactsManager:(OWSContactsManager *)contactsManager
                                                   blockingManager:(OWSBlockingManager *)blockingManager
+                                                     dbConnection:(YapDatabaseConnection *)dbConnection
                                       hideUnreadMessagesIndicator:(BOOL)hideUnreadMessagesIndicator
                                   firstUnseenInteractionTimestamp:
                                       (nullable NSNumber *)firstUnseenInteractionTimestampParameter
                                                      maxRangeSize:(int)maxRangeSize
 {
     OWSAssert(thread);
-    OWSAssert(storageManager);
+    OWSAssert(dbConnection);
     OWSAssert(contactsManager);
     OWSAssert(blockingManager);
     OWSAssert(maxRangeSize > 0);
@@ -113,7 +113,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     ThreadDynamicInteractions *result = [ThreadDynamicInteractions new];
 
-    [storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
         const int kMaxBlockOfferOutgoingMessageCount = 10;
 
         // Find any "dynamic" interactions and safety number changes.