diff --git a/src/renderer/features/albums/components/album-list-header-filters.tsx b/src/renderer/features/albums/components/album-list-header-filters.tsx
index 8051ddf3..96a6ddbd 100644
--- a/src/renderer/features/albums/components/album-list-header-filters.tsx
+++ b/src/renderer/features/albums/components/album-list-header-filters.tsx
@@ -84,7 +84,10 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
     const { pageKey, customFilters, handlePlay } = useListContext();
     const server = useCurrentServer();
     const { setFilter, setTable, setGrid, setDisplayType } = useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey({ key: pageKey });
+    const { display, filter, table, grid } = useListStoreByKey({
+        filter: customFilters,
+        key: pageKey,
+    });
     const cq = useContainerQuery();
 
     const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
diff --git a/src/renderer/features/songs/components/song-list-header-filters.tsx b/src/renderer/features/songs/components/song-list-header-filters.tsx
index d6b194df..73339fe0 100644
--- a/src/renderer/features/songs/components/song-list-header-filters.tsx
+++ b/src/renderer/features/songs/components/song-list-header-filters.tsx
@@ -78,7 +78,7 @@ interface SongListHeaderFiltersProps {
 export const SongListHeaderFilters = ({ tableRef }: SongListHeaderFiltersProps) => {
     const server = useCurrentServer();
     const { pageKey, handlePlay, customFilters } = useListContext();
-    const { display, table, filter } = useListStoreByKey({ key: pageKey });
+    const { display, table, filter } = useListStoreByKey({ filter: customFilters, key: pageKey });
     const { setFilter, setTable, setTablePagination, setDisplayType } = useListStoreActions();
 
     const { handleRefreshTable } = useListFilterRefresh({