diff --git a/ui/src/album/AlbumActions.js b/ui/src/album/AlbumActions.js
index eb16a51f1..2c7a48d1a 100644
--- a/ui/src/album/AlbumActions.js
+++ b/ui/src/album/AlbumActions.js
@@ -21,6 +21,13 @@ export const AlbumActions = ({
   const dispatch = useDispatch()
   const translate = useTranslate()
 
+  // TODO Not sure why data is accumulating tracks from previous plays... Needs investigation. For now, filter out
+  // the unwanted tracks
+  const filteredData = ids.reduce((acc, id) => {
+    acc[id] = data[id]
+    return acc
+  }, {})
+
   const shuffle = (data) => {
     const ids = Object.keys(data)
     for (let i = ids.length - 1; i > 0; i--) {
@@ -37,7 +44,7 @@ export const AlbumActions = ({
       <Button
         color={'secondary'}
         onClick={() => {
-          dispatch(playAlbum(ids[0], data))
+          dispatch(playAlbum(ids[0], filteredData))
         }}
         label={translate('resources.album.actions.playAll')}
       >
@@ -46,7 +53,7 @@ export const AlbumActions = ({
       <Button
         color={'secondary'}
         onClick={() => {
-          const shuffled = shuffle(data)
+          const shuffled = shuffle(filteredData)
           const firstId = Object.keys(shuffled)[0]
           dispatch(playAlbum(firstId, shuffled))
         }}
diff --git a/ui/src/player/queue.js b/ui/src/player/queue.js
index e97f1b047..0915cd6ae 100644
--- a/ui/src/player/queue.js
+++ b/ui/src/player/queue.js
@@ -8,7 +8,7 @@ const PLAYER_SCROBBLE = 'PLAYER_SCROBBLE'
 const PLAYER_PLAY_ALBUM = 'PLAYER_PLAY_ALBUM'
 
 const mapToAudioLists = (item) => ({
-  id: item.id,
+  // id: item.id,
   name: item.title,
   singer: item.artist,
   cover: subsonicUrl('getCoverArt', item.id, { size: 300 }),