diff --git a/wakuv2/waku.go b/wakuv2/waku.go
index 6c34abce0..f11953828 100644
--- a/wakuv2/waku.go
+++ b/wakuv2/waku.go
@@ -1221,6 +1221,10 @@ func (w *Waku) Stop() error {
 }
 
 func (w *Waku) OnNewEnvelopes(envelope *protocol.Envelope, msgType common.MessageType) ([]common.EnvelopeError, error) {
+        if envelope == nil {
+          return nil, errors.New("nil envelope error")
+        }
+
 	recvMessage := common.NewReceivedMessage(envelope, msgType)
 	envelopeErrors := make([]common.EnvelopeError, 0)