diff --git a/cmd/common-main.go b/cmd/common-main.go
index 12c68b375..1f674c3f2 100644
--- a/cmd/common-main.go
+++ b/cmd/common-main.go
@@ -619,8 +619,6 @@ func loadEnvVarsFromFiles() {
 }
 
 func handleCommonEnvVars() {
-	loadEnvVarsFromFiles()
-
 	var err error
 	globalBrowserEnabled, err = config.ParseBool(env.Get(config.EnvBrowser, config.EnableOn))
 	if err != nil {
diff --git a/cmd/server-main.go b/cmd/server-main.go
index 8a2cdb265..7933bf159 100644
--- a/cmd/server-main.go
+++ b/cmd/server-main.go
@@ -579,6 +579,9 @@ func serverMain(ctx *cli.Context) {
 
 	setDefaultProfilerRates()
 
+	// Always load ENV variables from files first.
+	loadEnvVarsFromFiles()
+
 	// Handle all server command args.
 	bootstrapTrace("serverHandleCmdArgs", func() {
 		serverHandleCmdArgs(ctx)