diff --git a/commands/server.go b/commands/server.go
index <HASH>..<HASH> 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -186,7 +186,9 @@ func server(cmd *cobra.Command, args []string) error {
 			if err != nil {
 				return err
 			}
-			language.Set("baseURL", baseURL)
+			if isMultiHost {
+				language.Set("baseURL", baseURL)
+			}
 			if i == 0 {
 				c.Set("baseURL", baseURL)
 			}
commands: Fix baseURL server regression for multilingual sites

This was introduced in <I>f<I>e<I>d<I>a<I>a7edbaae<I>aa a couple of days ago, and demonstrates that we really need better tests for the server/commands package.

Fixes #<I>