diff --git a/commands/server.go b/commands/server.go
index df75395d260..ae937508132 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -128,7 +128,7 @@ func server(cmd *cobra.Command, args []string) error {
 
 	viper.Set("port", serverPort)
 
-	BaseURL, err := fixURL(BaseURL)
+	BaseURL, err := fixURL(viper.GetString("BaseURL"))
 	if err != nil {
 		return err
 	}