diff --git a/tests/test_waku_rendezvous.nim b/tests/test_waku_rendezvous.nim
index b32ef27ba..c005a8f34 100644
--- a/tests/test_waku_rendezvous.nim
+++ b/tests/test_waku_rendezvous.nim
@@ -1,6 +1,6 @@
 {.used.}
 
-import chronos, testutils/unittests, libp2p, libp2p/protocols/rendezvous
+import chronos, testutils/unittests, libp2p/builders, libp2p/protocols/rendezvous
 
 import waku/node/waku_switch, ./testlib/common, ./testlib/wakucore
 
diff --git a/tests/test_waku_switch.nim b/tests/test_waku_switch.nim
index 1bf76e89c..e58bff12e 100644
--- a/tests/test_waku_switch.nim
+++ b/tests/test_waku_switch.nim
@@ -3,7 +3,7 @@
 import
   testutils/unittests,
   chronos,
-  libp2p,
+  libp2p/builders,
   libp2p/protocols/connectivity/autonat/client,
   libp2p/protocols/connectivity/relay/relay,
   libp2p/protocols/connectivity/relay/client,
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 18a2e79ce..8855bce08 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 18a2e79ce209d2f21d8c5db7a41659cc39dbe0b4
+Subproject commit 8855bce0854ecf4adad7a0556bb2b2d2f98e0e20
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index 225a29de7..23648c23a 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -1245,7 +1245,11 @@ proc startKeepalive*(node: WakuNode) =
 proc mountRendezvous*(node: WakuNode) {.async: (raises: []).} =
   info "mounting rendezvous discovery protocol"
 
-  node.rendezvous = RendezVous.new(node.switch)
+  try:
+    node.rendezvous = RendezVous.new(node.switch)
+  except Exception as e:
+    error "failed to create rendezvous", error = getCurrentExceptionMsg()
+    return
 
   if node.started:
     try: