diff --git a/package.json b/package.json
index ffaac80610..53dbec020a 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "joi": "^14.3.0",
     "just-flatten-it": "^2.1.0",
     "just-safe-set": "^2.1.0",
-    "libp2p": "~0.25.0-rc.6",
+    "libp2p": "~0.25.0",
     "libp2p-bootstrap": "~0.9.3",
     "libp2p-crypto": "~0.16.0",
     "libp2p-kad-dht": "~0.14.12",
diff --git a/src/core/runtime/libp2p-browser.js b/src/core/runtime/libp2p-browser.js
index 8dfdd0dfcb..fa7acaa84d 100644
--- a/src/core/runtime/libp2p-browser.js
+++ b/src/core/runtime/libp2p-browser.js
@@ -22,6 +22,13 @@ class Node extends libp2p {
     const wsstar = new WebSocketStarMulti({ servers: wsstarServers, id: _options.peerInfo.id, ignore_no_online: !wsstarServers.length || _options.wsStarIgnoreErrors })
 
     const defaults = {
+      switch: {
+        blacklistTTL: 2 * 60 * 1e3, // 2 minute base
+        blackListAttempts: 5, // back off 5 times
+        maxParallelDials: 100,
+        maxColdCalls: 25,
+        dialTimeout: 20e3
+      },
       modules: {
         transport: [
           WS,
diff --git a/src/core/runtime/libp2p-nodejs.js b/src/core/runtime/libp2p-nodejs.js
index 4a4bee2f3e..5a62f05bf1 100644
--- a/src/core/runtime/libp2p-nodejs.js
+++ b/src/core/runtime/libp2p-nodejs.js
@@ -21,6 +21,13 @@ class Node extends libp2p {
     const wsstar = new WebSocketStarMulti({ servers: wsstarServers, id: _options.peerInfo.id, ignore_no_online: !wsstarServers.length || _options.wsStarIgnoreErrors })
 
     const defaults = {
+      switch: {
+        blacklistTTL: 2 * 60 * 1e3, // 2 minute base
+        blackListAttempts: 5, // back off 5 times
+        maxParallelDials: 150,
+        maxColdCalls: 50,
+        dialTimeout: 10e3 // Be strict with dial time
+      },
       modules: {
         transport: [
           TCP,