diff --git a/ui/src/album/AlbumActions.js b/ui/src/album/AlbumActions.js
index 69a607cf08c..f67ad1eeb4a 100644
--- a/ui/src/album/AlbumActions.js
+++ b/ui/src/album/AlbumActions.js
@@ -1,4 +1,5 @@
 import React from 'react'
+import PropTypes from 'prop-types'
 import { useDispatch } from 'react-redux'
 import {
   Button,
@@ -13,15 +14,7 @@ import AddToQueueIcon from '@material-ui/icons/AddToQueue'
 import { addTracks, playTracks, shuffleTracks } from '../audioplayer'
 import subsonic from '../subsonic'
 
-const AlbumActions = ({
-  albumId,
-  className,
-  ids,
-  data,
-  exporter,
-  permanentFilter,
-  ...rest
-}) => {
+const AlbumActions = ({ className, ids, data, record, ...rest }) => {
   const dispatch = useDispatch()
   const translate = useTranslate()
 
@@ -38,8 +31,8 @@ const AlbumActions = ({
   }, [dispatch, data, ids])
 
   const handleDownload = React.useCallback(() => {
-    subsonic.download(albumId)
-  }, [albumId])
+    subsonic.download(record.id)
+  }, [record])
 
   return (
     <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
@@ -71,7 +64,13 @@ const AlbumActions = ({
   )
 }
 
+AlbumActions.propTypes = {
+  record: PropTypes.object.isRequired,
+  selectedIds: PropTypes.arrayOf(PropTypes.number),
+}
+
 AlbumActions.defaultProps = {
+  record: {},
   selectedIds: [],
   onUnselectItems: () => null,
 }
diff --git a/ui/src/album/AlbumShow.js b/ui/src/album/AlbumShow.js
index 7eeefe97880..ec3cb3a8c81 100644
--- a/ui/src/album/AlbumShow.js
+++ b/ui/src/album/AlbumShow.js
@@ -26,7 +26,7 @@ const AlbumShow = (props) => {
         {...props}
         albumId={props.id}
         title={<Title subTitle={record.name} />}
-        actions={<AlbumActions albumId={props.id} />}
+        actions={<AlbumActions record={record} />}
         filter={{ album_id: props.id }}
         resource={'albumSong'}
         exporter={false}
diff --git a/ui/src/playlist/PlaylistActions.js b/ui/src/playlist/PlaylistActions.js
index e4ec248757f..5aaf1f0c950 100644
--- a/ui/src/playlist/PlaylistActions.js
+++ b/ui/src/playlist/PlaylistActions.js
@@ -15,16 +15,9 @@ import { httpClient } from '../dataProvider'
 import { addTracks, playTracks, shuffleTracks } from '../audioplayer'
 import { M3U_MIME_TYPE, REST_URL } from '../consts'
 import subsonic from '../subsonic'
+import PropTypes from 'prop-types'
 
-const PlaylistActions = ({
-  className,
-  ids,
-  data,
-  exporter,
-  permanentFilter,
-  record,
-  ...rest
-}) => {
+const PlaylistActions = ({ className, ids, data, record, ...rest }) => {
   const dispatch = useDispatch()
   const translate = useTranslate()
 
@@ -98,7 +91,13 @@ const PlaylistActions = ({
   )
 }
 
+PlaylistActions.propTypes = {
+  record: PropTypes.object.isRequired,
+  selectedIds: PropTypes.arrayOf(PropTypes.number),
+}
+
 PlaylistActions.defaultProps = {
+  record: {},
   selectedIds: [],
   onUnselectItems: () => null,
 }