diff --git a/waku/v2/protocol/envelope.go b/waku/v2/protocol/envelope.go
index f72b1997..6b0a0f7b 100644
--- a/waku/v2/protocol/envelope.go
+++ b/waku/v2/protocol/envelope.go
@@ -1,6 +1,7 @@
 package protocol
 
 import (
+	"github.com/waku-org/go-waku/waku/v2/hash"
 	wpb "github.com/waku-org/go-waku/waku/v2/protocol/pb"
 	"github.com/waku-org/go-waku/waku/v2/protocol/store/pb"
 )
@@ -19,11 +20,12 @@ type Envelope struct {
 // as well as generating a hash based on the bytes that compose the message
 func NewEnvelope(msg *wpb.WakuMessage, receiverTime int64, pubSubTopic string) *Envelope {
 	messageHash := msg.Hash(pubSubTopic)
+	digest := hash.SHA256([]byte(msg.ContentTopic), msg.Payload)
 	return &Envelope{
 		msg:  msg,
 		hash: messageHash,
 		index: &pb.Index{
-			Digest:       messageHash,
+			Digest:       digest[:],
 			ReceiverTime: receiverTime,
 			SenderTime:   msg.Timestamp,
 			PubsubTopic:  pubSubTopic,