diff --git a/consts/consts.go b/consts/consts.go
index 9bad1ee46..c391be5e4 100644
--- a/consts/consts.go
+++ b/consts/consts.go
@@ -32,7 +32,7 @@ const (
 	URLPathUI           = "/app"
 	URLPathNativeAPI    = "/api"
 	URLPathSubsonicAPI  = "/rest"
-	URLPathPublic       = "/p"
+	URLPathPublic       = "/share"
 	URLPathPublicImages = URLPathPublic + "/img"
 
 	// DefaultUILoginBackgroundURL uses Navidrome curated background images collection,
diff --git a/ui/src/config.js b/ui/src/config.js
index 5431e45e6..06056a180 100644
--- a/ui/src/config.js
+++ b/ui/src/config.js
@@ -29,7 +29,7 @@ const defaultConfig = {
   devShowArtistPage: true,
   enableReplayGain: true,
   defaultDownsamplingFormat: 'opus',
-  publicBaseUrl: '/p',
+  publicBaseUrl: '/share',
 }
 
 let config
diff --git a/ui/src/utils/urls.js b/ui/src/utils/urls.js
index 427e15326..aba22f472 100644
--- a/ui/src/utils/urls.js
+++ b/ui/src/utils/urls.js
@@ -7,8 +7,11 @@ export const baseUrl = (path) => {
   return parts.join('/')
 }
 
-export const shareUrl = (path) => {
-  const url = new URL(config.publicBaseUrl + '/' + path, window.location.href)
+export const shareUrl = (id) => {
+  const url = new URL(
+    baseUrl(config.publicBaseUrl + '/' + id),
+    window.location.href
+  )
   return url.href
 }