diff --git a/commands/server.go b/commands/server.go
index ee30b9275..4d2a7335d 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -136,7 +136,7 @@ func fixUrl(s string) (string, error) {
 		s = viper.GetString("BaseUrl")
 		useLocalhost = true
 	}
-	if !strings.HasPrefix(s, "http://") {
+	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
 		s = "http://" + s
 	}
 	u, err := url.Parse(s)
diff --git a/commands/server_test.go b/commands/server_test.go
index d84579642..f2a292037 100644
--- a/commands/server_test.go
+++ b/commands/server_test.go
@@ -16,7 +16,8 @@ func TestFixUrl(t *testing.T) {
 		Result     string
 	}
 	tests := []data{
-		{"Basic localhost", "", "http://foo.com", true, 1313, "http://localhost:1313"},
+		{"Basic http localhost", "", "http://foo.com", true, 1313, "http://localhost:1313"},
+		{"Basic https localhost", "", "https://foo.com", true, 1313, "https://localhost:1313"},
 		{"Basic subdir", "", "http://foo.com/bar", true, 1313, "http://localhost:1313/bar"},
 		{"Basic production", "http://foo.com", "http://foo.com", false, 80, "http://foo.com"},
 		{"Production subdir", "http://foo.com/bar", "http://foo.com/bar", false, 80, "http://foo.com/bar"},