diff --git a/command/agent/agent.go b/command/agent/agent.go
index 80fe9b8e7..bdb4106df 100644
--- a/command/agent/agent.go
+++ b/command/agent/agent.go
@@ -227,11 +227,10 @@ func (a *Agent) setupClient() error {
 	conf.Node.NodeClass = a.config.Client.NodeClass
 	httpAddr := fmt.Sprintf("%s:%d", a.config.BindAddr, a.config.Ports.HTTP)
 	if a.config.Addresses.HTTP != "" && a.config.AdvertiseAddrs.HTTP == "" {
-		addr, err := net.ResolveTCPAddr("tcp", a.config.Addresses.HTTP)
-		if err != nil {
+		httpAddr = fmt.Sprintf("%s:%d", a.config.Addresses.HTTP, a.config.Ports.HTTP)
+		if _, err := net.ResolveTCPAddr("tcp", httpAddr); err != nil {
 			return fmt.Errorf("error resolving http addr: %v:", err)
 		}
-		httpAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 	} else if a.config.AdvertiseAddrs.HTTP != "" {
 		addr, err := net.ResolveTCPAddr("tcp", a.config.AdvertiseAddrs.HTTP)
 		if err != nil {