diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
index f3ab7ed0d6..a93c4f057f 100644
--- a/internal/cli/server/config.go
+++ b/internal/cli/server/config.go
@@ -935,9 +935,15 @@ func (c *Config) buildNode() (*node.Config, error) {
 		if cfg.P2P.StaticNodes, err = parseBootnodes(c.P2P.Discovery.StaticNodes); err != nil {
 			return nil, err
 		}
+		if len(cfg.P2P.StaticNodes) == 0 {
+			cfg.P2P.StaticNodes = cfg.StaticNodes()
+		}
 		if cfg.P2P.TrustedNodes, err = parseBootnodes(c.P2P.Discovery.TrustedNodes); err != nil {
 			return nil, err
 		}
+		if len(cfg.P2P.TrustedNodes) == 0 {
+			cfg.P2P.TrustedNodes = cfg.TrustedNodes()
+		}
 	}
 
 	if c.P2P.NoDiscover {