diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 29f051a4b..153b63560 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -583,7 +583,12 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
     ? ConversationType.GROUP
     : ConversationType.PRIVATE;
 
-  let conversationId = isIncoming ? source : destination;
+  let conversationId = isIncoming ? source : destination || source; // for synced message
+  if (!conversationId) {
+    window.log.error('We cannot handle a message without a conversationId');
+    confirm();
+    return;
+  }
   if (message.profileKey?.length) {
     await handleProfileUpdate(
       message.profileKey,