diff --git a/beszel/cmd/agent/agent.go b/beszel/cmd/agent/agent.go
index 631abc0..9622a67 100644
--- a/beszel/cmd/agent/agent.go
+++ b/beszel/cmd/agent/agent.go
@@ -117,6 +117,8 @@ func main() {
 
 	flag.Parse()
 
+	opts.addr = opts.getAddress()
+
 	var serverConfig agent.ServerOptions
 	var err error
 	serverConfig.Keys, err = opts.loadPublicKeys()
@@ -124,7 +126,7 @@ func main() {
 		log.Fatal("Failed to load public keys:", err)
 	}
 
-	serverConfig.Addr = opts.getAddress()
+	serverConfig.Addr = opts.addr
 	serverConfig.Network = opts.getNetwork()
 
 	agent := agent.NewAgent()
diff --git a/beszel/cmd/agent/agent_test.go b/beszel/cmd/agent/agent_test.go
index cc72fb7..31a48b2 100644
--- a/beszel/cmd/agent/agent_test.go
+++ b/beszel/cmd/agent/agent_test.go
@@ -54,6 +54,16 @@ func TestGetAddress(t *testing.T) {
 			},
 			expected: "7070",
 		},
+		{
+			name: "use unix socket from env var",
+			opts: cmdOptions{
+				addr: "",
+			},
+			envVars: map[string]string{
+				"ADDR": "/tmp/beszel.sock",
+			},
+			expected: "/tmp/beszel.sock",
+		},
 		{
 			name: "flag takes precedence over env vars",
 			opts: cmdOptions{