diff --git a/ui/src/album/AlbumGridView.js b/ui/src/album/AlbumGridView.js
index ff1d1c842..e9286a312 100644
--- a/ui/src/album/AlbumGridView.js
+++ b/ui/src/album/AlbumGridView.js
@@ -9,7 +9,7 @@ import {
 import { makeStyles } from '@material-ui/core/styles'
 import withWidth from '@material-ui/core/withWidth'
 import { Link } from 'react-router-dom'
-import { linkToRecord, Loading } from 'react-admin'
+import { linkToRecord, Loading, useListContext } from 'react-admin'
 import { withContentRect } from 'react-measure'
 import subsonic from '../subsonic'
 import {
@@ -147,8 +147,10 @@ const AlbumGridTile = ({ showArtist, record, basePath }) => {
   )
 }
 
-const LoadedAlbumGrid = ({ ids, data, basePath, width, isArtistView }) => {
+const LoadedAlbumGrid = ({ ids, data, basePath, width }) => {
   const classes = useStyles()
+  const { filterValues } = useListContext()
+  const isArtistView = !!(filterValues && filterValues.artist_id)
 
   return (
     <div className={classes.root}>
diff --git a/ui/src/album/AlbumList.js b/ui/src/album/AlbumList.js
index 075405fda..dd90fce88 100644
--- a/ui/src/album/AlbumList.js
+++ b/ui/src/album/AlbumList.js
@@ -10,7 +10,6 @@ import {
   SearchInput,
   Pagination,
   useTranslate,
-  useListParams,
 } from 'react-admin'
 import StarIcon from '@material-ui/icons/Star'
 import { withWidth } from '@material-ui/core'
@@ -59,18 +58,11 @@ const AlbumListTitle = ({ albumListType }) => {
 }
 
 const AlbumList = (props) => {
-  const { width, resource } = props
+  const { width } = props
   const albumView = useSelector((state) => state.albumView)
   const [perPage, perPageOptions] = useAlbumsPerPage(width)
   const location = useLocation()
 
-  const [query] = useListParams({
-    resource,
-    location,
-    perPage,
-  })
-  const isArtistView = !!(query.filter && query.filter.artist_id)
-
   const albumListType = location.pathname
     .replace(/^\/album/, '')
     .replace(/^\//, '')
@@ -99,7 +91,7 @@ const AlbumList = (props) => {
         title={<AlbumListTitle albumListType={albumListType} />}
       >
         {albumView.grid ? (
-          <AlbumGridView isArtistView={isArtistView} {...props} />
+          <AlbumGridView {...props} />
         ) : (
           <AlbumListView {...props} />
         )}