diff --git a/src/config.js b/src/config.js
index 55a5f22ec1..51a540ace4 100644
--- a/src/config.js
+++ b/src/config.js
@@ -45,11 +45,11 @@ const optionsSchema = s(
         kBucketSize: 'number',
         enabled: 'boolean?',
         randomWalk: optional(s({
-          enabled: 'boolean?',
+          enabled: 'boolean?', // disabled waiting for https://github.com/libp2p/js-libp2p-kad-dht/issues/86
           queriesPerPeriod: 'number?',
           interval: 'number?',
           timeout: 'number?'
-        }, { enabled: true, queriesPerPeriod: 1, interval: 30000, timeout: 10000 })),
+        }, { enabled: false, queriesPerPeriod: 1, interval: 30000, timeout: 10000 })),
         validators: 'object?',
         selectors: 'object?'
       }, { enabled: true, kBucketSize: 20, enabledDiscovery: true }),
diff --git a/test/config.spec.js b/test/config.spec.js
index 0d429f8edd..2a1f2bd436 100644
--- a/test/config.spec.js
+++ b/test/config.spec.js
@@ -97,7 +97,7 @@ describe('configuration', () => {
           kBucketSize: 20,
           enabled: true,
           randomWalk: {
-            enabled: true,
+            enabled: false,
             queriesPerPeriod: 1,
             interval: 30000,
             timeout: 10000
@@ -199,7 +199,7 @@ describe('configuration', () => {
           kBucketSize: 20,
           enabled: true,
           randomWalk: {
-            enabled: true,
+            enabled: false,
             queriesPerPeriod: 1,
             interval: 30000,
             timeout: 10000