diff --git a/commands/server.go b/commands/server.go
index 6b62dca70..921b9fbdb 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -110,8 +110,6 @@ func server(cmd *cobra.Command, args []string) {
 
 func serve(port int) {
 	jww.FEEDBACK.Println("Serving pages from " + helpers.AbsPathify(viper.GetString("PublishDir")))
-	jww.FEEDBACK.Printf("Web Server is available at %s\n", viper.GetString("BaseUrl"))
-	fmt.Println("Press ctrl+c to stop")
 
 	httpFs := &afero.HttpFs{SourceFs: hugofs.DestinationFS}
 	fileserver := http.FileServer(httpFs.Dir(helpers.AbsPathify(viper.GetString("PublishDir"))))
@@ -126,6 +124,10 @@ func serve(port int) {
 		http.Handle(u.Path+"/", http.StripPrefix(u.Path+"/", fileserver))
 	}
 
+	u.Scheme = "http"
+	jww.FEEDBACK.Printf("Web Server is available at %s\n", u.String())
+	fmt.Println("Press ctrl+c to stop")
+
 	err = http.ListenAndServe(":"+strconv.Itoa(port), nil)
 	if err != nil {
 		jww.ERROR.Printf("Error: %s\n", err.Error())