diff --git a/cmd/server/main.go b/cmd/server/main.go
index 0d8cdecec..d9302b96f 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -307,7 +307,9 @@ func main() {
 			parsed = &config.Config{}
 		}
 		parsed.Home = homeCfg
-		parsed.Port = 8317 // Default to 8317 for home mode, can be overridden by home config
+		if parsed.Port == 0 {
+			parsed.Port = 8317 // Default to 8317 for home mode, can be overridden by home config
+		}
 		parsed.UsageStatisticsEnabled = true
 		pluginSyncCfg := *parsed
 		parsed.Plugins.StoreAuth = nil