diff --git a/geth/node/node.go b/geth/node/node.go
index b2015977e..0ee064ebd 100644
--- a/geth/node/node.go
+++ b/geth/node/node.go
@@ -92,7 +92,7 @@ func defaultEmbeddedNodeConfig(config *params.NodeConfig) *node.Config {
 		Version:           config.Version,
 		P2P: p2p.Config{
 			NoDiscovery:      !config.Discovery,
-			DiscoveryV5:      true,
+			DiscoveryV5:      config.Discovery,
 			BootstrapNodes:   nil,
 			BootstrapNodesV5: nil,
 			ListenAddr:       config.ListenAddr,