diff --git a/src/renderer/components/virtual-table/cells/album-artist-cell.tsx b/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
index 419a4118..921d5e09 100644
--- a/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
@@ -38,18 +38,28 @@ export const AlbumArtistCell = ({ value, data }: ICellRendererParams) => {
                 ,
               </Text>
             )}{' '}
-            <Text
-              $link
-              $secondary
-              component={Link}
-              overflow="hidden"
-              size="md"
-              to={generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
-                albumArtistId: item.id,
-              })}
-            >
-              {item.name || '—'}
-            </Text>
+            {item.id ? (
+              <Text
+                $link
+                $secondary
+                component={Link}
+                overflow="hidden"
+                size="md"
+                to={generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
+                  albumArtistId: item.id,
+                })}
+              >
+                {item.name || '—'}
+              </Text>
+            ) : (
+              <Text
+                $secondary
+                overflow="hidden"
+                size="md"
+              >
+                {item.name || '—'}
+              </Text>
+            )}
           </React.Fragment>
         ))}
       </Text>
diff --git a/src/renderer/components/virtual-table/cells/artist-cell.tsx b/src/renderer/components/virtual-table/cells/artist-cell.tsx
index 4ced9d98..3c0ea589 100644
--- a/src/renderer/components/virtual-table/cells/artist-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/artist-cell.tsx
@@ -38,18 +38,28 @@ export const ArtistCell = ({ value, data }: ICellRendererParams) => {
                 ,
               </Text>
             )}{' '}
-            <Text
-              $link
-              $secondary
-              component={Link}
-              overflow="hidden"
-              size="md"
-              to={generatePath(AppRoute.LIBRARY_ARTISTS_DETAIL, {
-                artistId: item.id,
-              })}
-            >
-              {item.name || '—'}
-            </Text>
+            {item.id ? (
+              <Text
+                $link
+                $secondary
+                component={Link}
+                overflow="hidden"
+                size="md"
+                to={generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
+                  albumArtistId: item.id,
+                })}
+              >
+                {item.name || '—'}
+              </Text>
+            ) : (
+              <Text
+                $secondary
+                overflow="hidden"
+                size="md"
+              >
+                {item.name || '—'}
+              </Text>
+            )}
           </React.Fragment>
         ))}
       </Text>