diff --git a/go.mod b/go.mod
index 24d4af5f8..4b95e4a65 100644
--- a/go.mod
+++ b/go.mod
@@ -78,7 +78,7 @@ require (
 	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/meirf/gopart v0.0.0-20180520194036-37e9492a85a8
 	github.com/rmg/iso4217 v1.0.0
-	github.com/waku-org/go-waku v0.4.1-0.20230207135155-cce85913e6cc
+	github.com/waku-org/go-waku v0.4.1-0.20230207222722-7508b08c74e1
 	github.com/yeqown/go-qrcode/v2 v2.2.1
 	github.com/yeqown/go-qrcode/writer/standard v1.2.1
 )
diff --git a/go.sum b/go.sum
index c1f66a532..75c727fce 100644
--- a/go.sum
+++ b/go.sum
@@ -2067,8 +2067,8 @@ github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/waku-org/go-discover v0.0.0-20221209174356-61c833f34d98 h1:xwY0kW5XZFimdqfZb9cZwT1S3VJP9j3AE6bdNd9boXM=
 github.com/waku-org/go-discover v0.0.0-20221209174356-61c833f34d98/go.mod h1:eBHgM6T4EG0RZzxpxKy+rGz/6Dw2Nd8DWxS0lm9ESDw=
-github.com/waku-org/go-waku v0.4.1-0.20230207135155-cce85913e6cc h1:xRQ+shjjuhklZrjE4xJv7A9sNVoiz25QqYpmNfwKZAU=
-github.com/waku-org/go-waku v0.4.1-0.20230207135155-cce85913e6cc/go.mod h1:sI14mN/sM8inIb2x2b462wydSEFyOyuDKI1cjiVIIpM=
+github.com/waku-org/go-waku v0.4.1-0.20230207222722-7508b08c74e1 h1:A4VOIUaS7m3conNkm2N6ntlTxH0ESYHCT5gfQ9Dqqzk=
+github.com/waku-org/go-waku v0.4.1-0.20230207222722-7508b08c74e1/go.mod h1:sI14mN/sM8inIb2x2b462wydSEFyOyuDKI1cjiVIIpM=
 github.com/waku-org/go-zerokit-rln v0.1.7-wakuorg h1:2vVIBCtBih2w1K9ll8YnToTDZvbxcgbsClsPlJS/kkg=
 github.com/waku-org/go-zerokit-rln v0.1.7-wakuorg/go.mod h1:GlyaVeEWNEBxVJrWC6jFTvb4LNb9d9qnjdS6EiWVUvk=
 github.com/wealdtech/go-ens/v3 v3.5.0 h1:Huc9GxBgiGweCOGTYomvsg07K2QggAqZpZ5SuiZdC8o=
diff --git a/vendor/github.com/waku-org/go-waku/waku/v2/discv5/discover.go b/vendor/github.com/waku-org/go-waku/waku/v2/discv5/discover.go
index 184e84b09..ec23f6f32 100644
--- a/vendor/github.com/waku-org/go-waku/waku/v2/discv5/discover.go
+++ b/vendor/github.com/waku-org/go-waku/waku/v2/discv5/discover.go
@@ -20,6 +20,9 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/nat"
 )
 
+var ErrNoDiscV5Listener = errors.New("no discv5 listener")
+
+
 type DiscoveryV5 struct {
 	sync.RWMutex
 
@@ -180,6 +183,10 @@ func (d *DiscoveryV5) Start(ctx context.Context) error {
 }
 
 func (d *DiscoveryV5) SetBootnodes(nodes []*enode.Node) error {
+	if d.listener == nil {
+		return ErrNoDiscV5Listener
+	}
+
 	return d.listener.SetFallbackNodes(nodes)
 }
 
@@ -243,7 +250,7 @@ func evaluateNode(node *enode.Node) bool {
 
 func (d *DiscoveryV5) Iterator() (enode.Iterator, error) {
 	if d.listener == nil {
-		return nil, errors.New("no discv5 listener")
+		return nil, ErrNoDiscV5Listener
 	}
 
 	iterator := d.listener.RandomNodes()
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4c1d4c9b0..29e3915aa 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -985,7 +985,7 @@ github.com/vacp2p/mvds/transport
 github.com/waku-org/go-discover/discover
 github.com/waku-org/go-discover/discover/v4wire
 github.com/waku-org/go-discover/discover/v5wire
-# github.com/waku-org/go-waku v0.4.1-0.20230207135155-cce85913e6cc
+# github.com/waku-org/go-waku v0.4.1-0.20230207222722-7508b08c74e1
 ## explicit; go 1.18
 github.com/waku-org/go-waku/logging
 github.com/waku-org/go-waku/waku/persistence