diff --git a/VERSION b/VERSION
index 156fe0ca7..ecc59810e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.130.0
+0.130.1
diff --git a/go.mod b/go.mod
index 4b95e4a65..8791b4e7b 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.20230207222722-7508b08c74e1
+	github.com/waku-org/go-waku v0.4.1-0.20230209130305-c55a979af4d9
 	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 75c727fce..9563fdf36 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.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-waku v0.4.1-0.20230209130305-c55a979af4d9 h1:J40gqLBPZBF58A1uKaJub92jbxnRSvWCUizx7dYgcfE=
+github.com/waku-org/go-waku v0.4.1-0.20230209130305-c55a979af4d9/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/node/wakunode2.go b/vendor/github.com/waku-org/go-waku/waku/v2/node/wakunode2.go
index e961fd72e..1b0ad0824 100644
--- a/vendor/github.com/waku-org/go-waku/waku/v2/node/wakunode2.go
+++ b/vendor/github.com/waku-org/go-waku/waku/v2/node/wakunode2.go
@@ -408,9 +408,9 @@ func (w *WakuNode) Stop() {
 
 	w.host.Close()
 
-	close(w.enrChangeCh)
-
 	w.wg.Wait()
+
+	close(w.enrChangeCh)
 }
 
 // Host returns the libp2p Host used by the WakuNode
diff --git a/vendor/github.com/waku-org/go-waku/waku/v2/utils/enr.go b/vendor/github.com/waku-org/go-waku/waku/v2/utils/enr.go
index 1aebd7422..e4e73f9a9 100644
--- a/vendor/github.com/waku-org/go-waku/waku/v2/utils/enr.go
+++ b/vendor/github.com/waku-org/go-waku/waku/v2/utils/enr.go
@@ -75,7 +75,7 @@ func Multiaddress(node *enode.Node) ([]multiaddr.Multiaddr, error) {
 	if err := node.Record().Load(enr.WithEntry(MultiaddrENRField, &multiaddrRaw)); err != nil {
 		if !enr.IsNotFound(err) {
 			return nil, err
-		} else {
+		} else if len(multiaddrRaw) == 0 {
 			// No multiaddr entry on enr
 			return result, nil
 		}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 29e3915aa..bad56b972 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.20230207222722-7508b08c74e1
+# github.com/waku-org/go-waku v0.4.1-0.20230209130305-c55a979af4d9
 ## explicit; go 1.18
 github.com/waku-org/go-waku/logging
 github.com/waku-org/go-waku/waku/persistence