diff --git a/ui/src/audioplayer/Player.js b/ui/src/audioplayer/Player.js
index 4544699d15c..5b16b3c1042 100644
--- a/ui/src/audioplayer/Player.js
+++ b/ui/src/audioplayer/Player.js
@@ -58,17 +58,17 @@ const Player = () => {
     if (isNaN(info.duration) || progress < 90) {
       return
     }
-    const item = queue.queue.find((item) => item.id === info.id)
+    const item = queue.queue.find((item) => item.trackId === info.trackId)
     if (item && !item.scrobbled) {
-      dispatch(scrobbled(info.id))
-      subsonic.scrobble(info.id, true)
+      dispatch(scrobbled(info.trackId))
+      subsonic.scrobble(info.trackId, true)
     }
   }
 
   const OnAudioPlay = (info) => {
     if (info.duration) {
-      subsonic.scrobble(info.id, false)
-      dataProvider.getOne('keepalive', { id: info.id })
+      subsonic.scrobble(info.trackId, false)
+      dataProvider.getOne('keepalive', { id: info.trackId })
     }
   }
 
diff --git a/ui/src/audioplayer/queue.js b/ui/src/audioplayer/queue.js
index dece0326f4d..d7129ae9326 100644
--- a/ui/src/audioplayer/queue.js
+++ b/ui/src/audioplayer/queue.js
@@ -9,6 +9,7 @@ const PLAYER_PLAY_ALBUM = 'PLAYER_PLAY_ALBUM'
 
 const mapToAudioLists = (item) => ({
   id: item.id,
+  trackId: item.id,
   name: item.title,
   singer: item.artist,
   cover: subsonic.url('getCoverArt', item.id, { size: 300 }),
@@ -60,7 +61,7 @@ const playQueueReducer = (
       const newQueue = previousState.queue.map((item) => {
         return {
           ...item,
-          scrobbled: item.scrobbled || item.id === data
+          scrobbled: item.scrobbled || item.trackId === data
         }
       })
       return { queue: newQueue, clear: false }