diff --git a/ts/jobs/helpers/getUntrustedConversationIds.ts b/ts/jobs/helpers/getUntrustedConversationIds.ts
index 3d5100c82..8ebb42006 100644
--- a/ts/jobs/helpers/getUntrustedConversationIds.ts
+++ b/ts/jobs/helpers/getUntrustedConversationIds.ts
@@ -1,14 +1,20 @@
 // Copyright 2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
+import { isNotNil } from '../../util/isNotNil';
+
 export function getUntrustedConversationIds(
   recipients: ReadonlyArray<string>
 ): Array<string> {
-  return recipients.filter(recipient => {
-    const recipientConversation = window.ConversationController.getOrCreate(
-      recipient,
-      'private'
-    );
-    return recipientConversation.isUntrusted();
-  });
+  return recipients
+    .map(recipient => {
+      const recipientConversation = window.ConversationController.getOrCreate(
+        recipient,
+        'private'
+      );
+      return recipientConversation.isUntrusted()
+        ? recipientConversation.id
+        : null;
+    })
+    .filter(isNotNil);
 }
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 50d9e929a..d61cae6ed 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1022,6 +1022,11 @@ export const getConversationsStoppingSend = createSelector(
     const conversations = conversationIds
       .map(conversationId => conversationSelector(conversationId))
       .filter(isNotNil);
+    if (conversationIds.length !== conversations.length) {
+      log.warn(
+        `getConversationsStoppingSend: Started with ${conversationIds.length} items, ended up with ${conversations.length}.`
+      );
+    }
     return sortByTitle(conversations);
   }
 );