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 8ad0cad3..34e77b99 100644
--- a/src/renderer/features/artists/components/album-artist-detail-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx
@@ -568,7 +568,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                     suppressRowDrag
                                     columnDefs={topSongsColumnDefs}
                                     enableCellChangeFlash={false}
-                                    getRowId={(data) => data.data.id}
+                                    getRowId={(data) => data.data.uniqueId}
                                     rowData={topSongs}
                                     rowHeight={60}
                                     rowSelection="multiple"
diff --git a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx
index 63ade6d4..77f456ed 100644
--- a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx
@@ -66,7 +66,7 @@ export const AlbumArtistDetailTopSongsListContent = ({
                     ref={tableRef}
                     shouldUpdateSong
                     {...tableProps}
-                    getRowId={(data) => data.data.id}
+                    getRowId={(data) => data.data.uniqueId}
                     rowClassRules={rowClassRules}
                     rowData={data}
                     rowModelType="clientSide"
diff --git a/src/renderer/features/similar-songs/components/similar-songs-list.tsx b/src/renderer/features/similar-songs/components/similar-songs-list.tsx
index 5089120d..3e302163 100644
--- a/src/renderer/features/similar-songs/components/similar-songs-list.tsx
+++ b/src/renderer/features/similar-songs/components/similar-songs-list.tsx
@@ -70,7 +70,7 @@ export const SimilarSongsList = ({ count, fullScreen, song }: SimilarSongsListPr
                         song,
                     }}
                     deselectOnClickOutside={fullScreen}
-                    getRowId={(data) => data.data.id}
+                    getRowId={(data) => data.data.uniqueId}
                     rowBuffer={50}
                     rowData={songQuery.data ?? []}
                     rowHeight={tableConfig.rowHeight || 40}