diff --git a/ts/services/storageRecordOps.preload.ts b/ts/services/storageRecordOps.preload.ts
index b3683f8a2f..24e14eabe6 100644
--- a/ts/services/storageRecordOps.preload.ts
+++ b/ts/services/storageRecordOps.preload.ts
@@ -846,11 +846,14 @@ export function toDefunctOrPendingCallLinkRecord(
 function toRecipient(
   conversationId: string,
   logPrefix: string
-): Proto.Recipient {
+): Proto.Recipient | undefined {
   const conversation = window.ConversationController.get(conversationId);
 
   if (conversation == null) {
-    throw new Error(`${logPrefix}/toRecipient: Missing conversation`);
+    log.error(
+      `${logPrefix}/toRecipient: Missing conversation with id ${conversationId}`
+    );
+    return undefined;
   }
 
   const logId = `${logPrefix}/toRecipient(${conversation.idForLogging()})`;
@@ -896,9 +899,11 @@ function toRecipients(
   conversationIds: ReadonlyArray<string>,
   logPrefix: string
 ): Array<Proto.Recipient> {
-  return conversationIds.map(conversationId => {
-    return toRecipient(conversationId, logPrefix);
-  });
+  return conversationIds
+    .map(conversationId => {
+      return toRecipient(conversationId, logPrefix);
+    })
+    .filter(isNotNil);
 }
 
 function toChatFolderRecordFolderType(