diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
index 442b67ae72..b04d47fc81 100644
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
@@ -941,7 +941,7 @@ func createAndStartCluster(cli *daemonCLI, d *daemon.Daemon) (*cluster.Cluster,
 		DefaultAdvertiseAddr:   cli.Config.SwarmDefaultAdvertiseAddr,
 		RaftHeartbeatTick:      cli.Config.SwarmRaftHeartbeatTick,
 		RaftElectionTick:       cli.Config.SwarmRaftElectionTick,
-		RuntimeRoot:            cli.getSwarmRunRoot(),
+		RuntimeRoot:            getSwarmRunRoot(cli.Config),
 	})
 	if err != nil {
 		return nil, err
diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
index 028c68d806..0b3322e292 100644
--- a/cmd/dockerd/daemon_unix.go
+++ b/cmd/dockerd/daemon_unix.go
@@ -66,8 +66,8 @@ func (cli *daemonCLI) setupConfigReloadTrap() {
 
 // getSwarmRunRoot gets the root directory for swarm to store runtime state
 // For example, the control socket
-func (cli *daemonCLI) getSwarmRunRoot() string {
-	return filepath.Join(cli.Config.ExecRoot, "swarm")
+func getSwarmRunRoot(cfg *config.Config) string {
+	return filepath.Join(cfg.ExecRoot, "swarm")
 }
 
 // allocateDaemonPort ensures that there are no containers
diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go
index 7e19c3e782..7cc7ecb523 100644
--- a/cmd/dockerd/daemon_windows.go
+++ b/cmd/dockerd/daemon_windows.go
@@ -88,7 +88,7 @@ func (cli *daemonCLI) setupConfigReloadTrap() {
 
 // getSwarmRunRoot gets the root directory for swarm to store runtime state
 // For example, the control socket
-func (cli *daemonCLI) getSwarmRunRoot() string {
+func getSwarmRunRoot(*config.Config) string {
 	return ""
 }