diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 77780f73a..7ed9eca8e 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -82,7 +82,7 @@ async function decryptForMediumGroup(
     );
     return null;
   }
-
+  envelope.senderIdentity = sourceAsStr;
   const plaintext = await decryptWithSenderKey(
     ciphertext,
     keyIdx,
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 907cd8daa..813b8b883 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -296,7 +296,7 @@ export async function handleDataMessage(
   }
   const message = await processDecrypted(envelope, dataMessage);
   const ourPubKey = window.textsecure.storage.user.getNumber();
-  const senderPubKey = envelope.source;
+  const senderPubKey = envelope.senderIdentity || envelope.source;
   const isMe = senderPubKey === ourPubKey;
   const conversation = window.ConversationController.get(senderPubKey);