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 5bb29a9f..9756e8ff 100644
--- a/src/renderer/features/albums/components/album-list-header-filters.tsx
+++ b/src/renderer/features/albums/components/album-list-header-filters.tsx
@@ -414,9 +414,14 @@ export const AlbumListHeaderFilters = ({
 
         const isSubsonicFilterApplied =
             server?.type === ServerType.SUBSONIC &&
-            (filter.maxYear || filter.minYear || filter.genres?.length || filter.favorite);
+            (filter.maxYear || filter.minYear || filter.favorite);
 
-        return isNavidromeFilterApplied || isJellyfinFilterApplied || isSubsonicFilterApplied;
+        return (
+            isNavidromeFilterApplied ||
+            isJellyfinFilterApplied ||
+            isSubsonicFilterApplied ||
+            filter.genres?.length
+        );
     }, [
         filter?._custom?.jellyfin,
         filter?._custom?.navidrome,
diff --git a/src/renderer/features/albums/components/navidrome-album-filters.tsx b/src/renderer/features/albums/components/navidrome-album-filters.tsx
index ce15d354..b3fcc0e9 100644
--- a/src/renderer/features/albums/components/navidrome-album-filters.tsx
+++ b/src/renderer/features/albums/components/navidrome-album-filters.tsx
@@ -256,7 +256,7 @@ export const NavidromeAlbumFilters = ({
                 <SelectWithInvalidData
                     clearable
                     data={genreList}
-                    defaultValue={filter._custom?.navidrome?.genre_id}
+                    defaultValue={filter.genres && filter.genres[0]}
                     label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
                     onChange={handleGenresFilter}
                     searchable