diff --git a/ts/ConversationController.preload.ts b/ts/ConversationController.preload.ts
index 1471c06549..097dea5b10 100644
--- a/ts/ConversationController.preload.ts
+++ b/ts/ConversationController.preload.ts
@@ -156,7 +156,7 @@ async function safeCombineConversations(
 
 const MAX_MESSAGE_BODY_LENGTH = 64 * 1024;
 
-const { getAllConversations, getMessagesBySentAt } = DataReader;
+const { getAllConversations } = DataReader;
 
 const {
   migrateConversationMessages,
@@ -1519,11 +1519,13 @@ export class ConversationController {
     targetFromId: string,
     targetTimestamp: number
   ): Promise<ConversationModel | null | undefined> {
-    const messages = await getMessagesBySentAt(targetTimestamp);
-    const targetMessage = messages.find(m => getAuthorId(m) === targetFromId);
+    const targetMessage = await window.MessageCache.findBySentAt(
+      targetTimestamp,
+      m => getAuthorId(m.attributes) === targetFromId
+    );
 
     if (targetMessage) {
-      return this.get(targetMessage.conversationId);
+      return this.get(targetMessage.get('conversationId'));
     }
 
     return null;
diff --git a/ts/util/handleEditMessage.preload.ts b/ts/util/handleEditMessage.preload.ts
index b260aeb6c5..f33eff9a4f 100644
--- a/ts/util/handleEditMessage.preload.ts
+++ b/ts/util/handleEditMessage.preload.ts
@@ -203,9 +203,9 @@ export async function handleEditMessage(
     bodyAttachment: editedMessage.bodyAttachment,
     bodyRanges: editedMessage.bodyRanges,
     editHistory,
-    editMessageTimestamp: upgradedEditedMessageData.timestamp,
-    editMessageReceivedAt: upgradedEditedMessageData.received_at,
-    editMessageReceivedAtMs: upgradedEditedMessageData.received_at_ms,
+    editMessageTimestamp: editedMessage.timestamp,
+    editMessageReceivedAt: editedMessage.received_at,
+    editMessageReceivedAtMs: editedMessage.received_at_ms,
     preview: editedMessage.preview,
     quote: editedMessage.quote,
   });
@@ -271,17 +271,15 @@ export async function handleEditMessage(
     : ReadStatus.Unread;
 
   // Save both the main message and the edited message for fast lookups
-  drop(
-    DataWriter.saveEditedMessage(
-      mainMessageModel.attributes,
-      itemStorage.user.getCheckedAci(),
-      {
-        conversationId: editAttributes.conversationId,
-        messageId: mainMessage.id,
-        readStatus,
-        sentAt: upgradedEditedMessageData.timestamp,
-      }
-    )
+  await DataWriter.saveEditedMessage(
+    mainMessageModel.attributes,
+    itemStorage.user.getCheckedAci(),
+    {
+      conversationId: editAttributes.conversationId,
+      messageId: mainMessage.id,
+      readStatus,
+      sentAt: upgradedEditedMessageData.timestamp,
+    }
   );
 
   if (conversation) {