diff --git a/ui/src/player/Player.js b/ui/src/player/Player.js
index 0b0350356..223eb4baf 100644
--- a/ui/src/player/Player.js
+++ b/ui/src/player/Player.js
@@ -56,21 +56,13 @@ const Player = () => {
     const item = queue.queue.find((item) => item.id === info.id)
     if (item && !item.scrobbled) {
       dispatch(scrobble(info.id))
-      fetchUtils.fetchJson(
-        `/rest/scrobble?u=admin&jwt=${localStorage.getItem(
-          'token'
-        )}&f=json&v=1.8.0&c=NavidromeUI&id=${info.id}&submission=true`
-      )
+      fetchUtils.fetchJson(info.scrobble(true))
     }
   }
 
   const OnAudioPlay = (info) => {
     if (info.duration) {
-      fetchUtils.fetchJson(
-        `/rest/scrobble?u=admin&jwt=${localStorage.getItem(
-          'token'
-        )}&f=json&v=1.8.0&c=NavidromeUI&id=${info.id}&submission=false`
-      )
+      fetchUtils.fetchJson(info.scrobble(false))
       dataProvider.getOne('keepalive', { id: info.id })
     }
   }
diff --git a/ui/src/player/queue.js b/ui/src/player/queue.js
index 422859930..b56b0ac2b 100644
--- a/ui/src/player/queue.js
+++ b/ui/src/player/queue.js
@@ -14,7 +14,11 @@ const mapToAudioLists = (item) => ({
   }&jwt=${localStorage.getItem('token')}`,
   musicSrc: `/rest/stream?u=admin&f=json&v=1.8.0&c=NavidromeUI&jwt=${localStorage.getItem(
     'token'
-  )}&id=${item.id}&_=${new Date().getTime()}`
+  )}&id=${item.id}&_=${new Date().getTime()}`,
+  scrobble: (submit) =>
+    `/rest/scrobble?u=admin&jwt=${localStorage.getItem(
+      'token'
+    )}&f=json&v=1.8.0&c=NavidromeUI&id=${item.id}&submission=${submit}`
 })
 
 const addTrack = (data) => ({