diff --git a/ts/textsecure/MessageReceiver.preload.ts b/ts/textsecure/MessageReceiver.preload.ts
index 459368aa0b..959ce0952a 100644
--- a/ts/textsecure/MessageReceiver.preload.ts
+++ b/ts/textsecure/MessageReceiver.preload.ts
@@ -453,7 +453,12 @@ export default class MessageReceiver
           ),
           timestamp: decoded.clientTimestamp?.toNumber() ?? 0,
           content,
-          serverGuid: decoded.serverGuid ?? getGuid(),
+          serverGuid:
+            (Bytes.isNotEmpty(decoded.serverGuidBinary)
+              ? bytesToUuid(decoded.serverGuidBinary)
+              : undefined) ??
+            decoded.serverGuid ??
+            getGuid(),
           serverTimestamp,
           urgent: isBoolean(decoded.urgent) ? decoded.urgent : true,
           story: decoded.story ?? false,