diff --git a/pkg/agent/config/config.go b/pkg/agent/config/config.go
index 58684c8adb..d6b330407c 100644
--- a/pkg/agent/config/config.go
+++ b/pkg/agent/config/config.go
@@ -253,8 +253,6 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
 		return nil, err
 	}
 
-	hostnameCheck(nodeName)
-
 	nodeCertFile := filepath.Join(envInfo.DataDir, "token-node.crt")
 	nodeKeyFile := filepath.Join(envInfo.DataDir, "token-node.key")
 	nodePasswordFile := filepath.Join(envInfo.DataDir, "node-password.txt")
@@ -351,13 +349,18 @@ func getConfig(info *clientaccess.Info) (*config.Control, error) {
 	return controlControl, json.Unmarshal(data, controlControl)
 }
 
-func hostnameCheck(hostname string) {
-	for {
-		_, err := sysnet.LookupHost(hostname)
+func HostnameCheck(cfg cmds.Agent) error {
+	hostname, _, err := getHostnameAndIP(cfg)
+	if err != nil {
+		return err
+	}
+	for i := 0; i < 5; i++ {
+		_, err = sysnet.LookupHost(hostname)
 		if err == nil {
-			break
+			return nil
 		}
 		logrus.Infof("Waiting for hostname %s to be resolvable: %v", hostname, err)
-		time.Sleep(2 * time.Second)
+		time.Sleep(time.Second * 3)
 	}
+	return fmt.Errorf("Timed out waiting for hostname %s to be resolvable: %v", hostname, err)
 }
diff --git a/pkg/agent/run.go b/pkg/agent/run.go
index fada1255cd..9e36cda0bf 100644
--- a/pkg/agent/run.go
+++ b/pkg/agent/run.go
@@ -25,6 +25,10 @@ import (
 func run(ctx context.Context, cfg cmds.Agent) error {
 	nodeConfig := config.Get(ctx, cfg)
 
+	if err := config.HostnameCheck(cfg); err != nil {
+		return err
+	}
+
 	if !nodeConfig.NoFlannel {
 		if err := flannel.Prepare(ctx, nodeConfig); err != nil {
 			return err