diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index f14948c0..a24de39d 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -317,12 +317,9 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                                     component={Link}
                                     radius={0}
                                     size="md"
-                                    to={generatePath(
-                                        `${AppRoute.LIBRARY_ALBUMS}?genre=${genre.id}`,
-                                        {
-                                            albumId,
-                                        },
-                                    )}
+                                    to={generatePath(AppRoute.LIBRARY_GENRES_SONGS, {
+                                        genreId: genre.id,
+                                    })}
                                     variant="outline"
                                 >
                                     {genre.name}
diff --git a/src/renderer/features/artists/components/album-artist-detail-content.tsx b/src/renderer/features/artists/components/album-artist-detail-content.tsx
index 455e69e7..71af4144 100644
--- a/src/renderer/features/artists/components/album-artist-detail-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx
@@ -400,12 +400,9 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                     component={Link}
                                     radius="md"
                                     size="md"
-                                    to={generatePath(
-                                        `${AppRoute.LIBRARY_ALBUM_ARTISTS}?genre=${genre.id}`,
-                                        {
-                                            albumArtistId,
-                                        },
-                                    )}
+                                    to={generatePath(AppRoute.LIBRARY_GENRES_SONGS, {
+                                        genreId: genre.id,
+                                    })}
                                     variant="outline"
                                 >
                                     {genre.name}