diff --git a/cmd/node-canary/main.go b/cmd/node-canary/main.go
index 79f8bc94a..5bc43a4a5 100644
--- a/cmd/node-canary/main.go
+++ b/cmd/node-canary/main.go
@@ -253,6 +253,7 @@ func makeNodeConfig() (*params.NodeConfig, error) {
 		nodeConfig.LogFile = *logFile
 	}
 
+	nodeConfig.NoDiscovery = true
 	nodeConfig.ListenAddr = ""
 	if *staticEnodeAddr != "" {
 		nodeConfig.ClusterConfig.Enabled = true
diff --git a/config/cli/fleet-eth.beta.json b/config/cli/fleet-eth.beta.json
index 565ab7fde..4bc787523 100644
--- a/config/cli/fleet-eth.beta.json
+++ b/config/cli/fleet-eth.beta.json
@@ -1,5 +1,6 @@
 {
   "Rendezvous": true,
+  "NoDiscovery": false,
   "ClusterConfig": {
     "Enabled": true,
     "Fleet": "eth.beta",
diff --git a/config/cli/fleet-eth.staging.json b/config/cli/fleet-eth.staging.json
index b856838a6..0c07369af 100644
--- a/config/cli/fleet-eth.staging.json
+++ b/config/cli/fleet-eth.staging.json
@@ -1,5 +1,6 @@
 {
   "Rendezvous": true,
+  "NoDiscovery": false,
   "ClusterConfig": {
     "Enabled": true,
     "Fleet": "eth.staging",
diff --git a/config/cli/fleet-eth.test.json b/config/cli/fleet-eth.test.json
index c971170b0..3de0cf04f 100644
--- a/config/cli/fleet-eth.test.json
+++ b/config/cli/fleet-eth.test.json
@@ -1,5 +1,6 @@
 {
   "LogLevel": "DEBUG",
+  "NoDiscovery": false,
   "ClusterConfig": {
     "Enabled": true,
     "Fleet": "eth.test",
diff --git a/params/config.go b/params/config.go
index 858da7d03..823327922 100644
--- a/params/config.go
+++ b/params/config.go
@@ -315,6 +315,7 @@ func WithFleet(fleet string) Option {
 		if fleet == FleetUndefined {
 			return nil
 		}
+		c.NoDiscovery = false
 		c.ClusterConfig.Enabled = true
 		return loadConfigFromAsset(fmt.Sprintf("../config/cli/fleet-%s.json", fleet), c)
 	}
@@ -342,7 +343,7 @@ func NewNodeConfigWithDefaults(dataDir string, networkID uint64, opts ...Option)
 		return nil, err
 	}
 
-	c.NoDiscovery = false
+	c.NoDiscovery = true
 	c.HTTPHost = ""
 	c.ListenAddr = ":30303"
 	c.LogEnabled = true