diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index e3c967ad1..e0f70b717 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit e3c967ad1939fb33b8e13759037d193734acd202
+Subproject commit e0f70b71778bf9613421261b22a56499c913f806
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index add29b16b..56b984a2e 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -90,8 +90,8 @@ proc newWakuSwitch*(
       .withMaxIn(maxIn)
       .withMaxOut(maxOut)
       .withMaxConnsPerPeer(maxConnsPerPeer)
-      .withMplex(inTimeout, outTimeout)
       .withYamux()
+      .withMplex(inTimeout, outTimeout)
       .withNoise()
       .withTcpTransport(transportFlags)
       .withNameResolver(nameResolver)