diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 169a54846..dee268429 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3123,10 +3123,7 @@ typedef enum : NSUInteger {
 
 - (YapDatabaseConnection *)editingDatabaseConnection
 {
-    if (!_editingDatabaseConnection) {
-        _editingDatabaseConnection = [self.primaryStorage newDatabaseConnection];
-    }
-    return _editingDatabaseConnection;
+    return OWSPrimaryStorage.sharedManager.dbReadWriteConnection;
 }
 
 - (void)uiDatabaseDidUpdateExternally:(NSNotification *)notification