diff --git a/pkg/apiaddresses/controller.go b/pkg/apiaddresses/controller.go
index 4d36bcae41..684a0ece79 100644
--- a/pkg/apiaddresses/controller.go
+++ b/pkg/apiaddresses/controller.go
@@ -26,7 +26,10 @@ func Register(ctx context.Context, runtime *config.ControlRuntime, endpoints con
 
 	cl, err := etcd.GetClient(h.ctx, h.runtime, "https://127.0.0.1:2379")
 	if err != nil {
-		return err
+		cl, err = etcd.GetClient(h.ctx, h.runtime, "https://[::1]:2379")
+		if err != nil {
+			return err
+		}
 	}
 	h.etcdClient = cl
 
diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
index 617347fc7a..e845b0e944 100644
--- a/pkg/cli/server/server.go
+++ b/pkg/cli/server/server.go
@@ -460,9 +460,10 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
 	if ip == "" {
 		ip = "127.0.0.1"
 		if IPv6only {
-			ip = "[::1]"
+			ip = "::1"
 		}
-	} else if utilsnet.IsIPv6String(ip) {
+	}
+	if utilsnet.IsIPv6String(ip) {
 		ip = fmt.Sprintf("[%s]", ip)
 	}
 
diff --git a/pkg/daemons/control/deps/deps.go b/pkg/daemons/control/deps/deps.go
index 0628725167..230c2e97e7 100644
--- a/pkg/daemons/control/deps/deps.go
+++ b/pkg/daemons/control/deps/deps.go
@@ -308,11 +308,9 @@ func genClientCerts(config *config.Control) error {
 	var certGen bool
 
 	IPv6OnlyService, _ := util.IsIPv6OnlyCIDRs(config.ServiceIPRanges)
-	ip := ""
+	ip := "127.0.0.1"
 	if IPv6OnlyService {
 		ip = "[::1]"
-	} else {
-		ip = "127.0.0.1"
 	}
 	apiEndpoint := fmt.Sprintf("https://%s:%d", ip, config.APIServerPort)