diff --git a/commands/server.go b/commands/server.go
index b4d37d3e6..d82a345f5 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -40,7 +40,8 @@ Serve them up.`,
 func server(cmd *cobra.Command, args []string) {
 	InitializeConfig()
 
-	if Config.BaseUrl == "" {
+	// Unless command line overrides, we use localhost for the server
+	if BaseUrl == "" {
 		Config.BaseUrl = "http://localhost:" + strconv.Itoa(serverPort)
 	}