diff --git a/app/cmd.go b/app/cmd.go
index 82f7dab54e..46104ee87f 100644
--- a/app/cmd.go
+++ b/app/cmd.go
@@ -676,6 +676,8 @@ func getConfig(ctx context.Context) (Config, error) {
 		if u.Scheme == "" {
 			return cfg, errors.New("public-url must be an absolute URL (missing scheme)")
 		}
+		u.Path = strings.TrimSuffix(u.Path, "/")
+		cfg.PublicURL = u.String()
 		if cfg.HTTPPrefix != "" {
 			return cfg, errors.New("public-url and http-prefix cannot be used together")
 		}