diff --git a/agent/agent.go b/agent/agent.go
index 4020052..2f94140 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -104,6 +104,11 @@ func New(logger *logrus.Logger, version string) *Agent {
 	winTempDir := defaultWinTmpDir
 	winRunAsUserTmpDir := defaultWinTmpDir
 
+	hostname, err := os.Hostname()
+	if err != nil {
+		hostname = info.Hostname
+	}
+
 	var pybin string
 	switch runtime.GOARCH {
 	case "amd64":
@@ -201,7 +206,7 @@ func New(logger *logrus.Logger, version string) *Agent {
 	}
 
 	return &Agent{
-		Hostname:           info.Hostname,
+		Hostname:           hostname,
 		BaseURL:            ac.BaseURL,
 		AgentID:            ac.AgentID,
 		ApiURL:             ac.APIURL,