diff --git a/packages/status-js/src/client/community/handle-waku-message.ts b/packages/status-js/src/client/community/handle-waku-message.ts
index cfefc2e9..98c0f5a4 100644
--- a/packages/status-js/src/client/community/handle-waku-message.ts
+++ b/packages/status-js/src/client/community/handle-waku-message.ts
@@ -57,7 +57,7 @@ export function handleWakuMessage(
   )
 
   const messageId = payloadToId(
-    decodedProtocol?.publicMessage || decodedMetadata.payload,
+    decodedProtocol?.publicMessage ?? wakuMessage.payload,
     publicKey
   )