diff --git a/src-tauri/src/artist_vectors/suggestions.rs b/src-tauri/src/artist_vectors/suggestions.rs
index 7b9b181e7..71a219a58 100644
--- a/src-tauri/src/artist_vectors/suggestions.rs
+++ b/src-tauri/src/artist_vectors/suggestions.rs
@@ -396,11 +396,10 @@ impl SuggestionsEngine {
         };
 
         // Extract artist name and ID from track performer
-        let (track_artist, artist_id) = track
-            .performer
-            .as_ref()
-            .map(|p| (p.name.clone(), p.id))
-            .unwrap_or_default();
+        let (track_artist, artist_id) = match &track.performer {
+            Some(p) => (p.name.clone(), Some(p.id)),
+            None => (String::new(), None),
+        };
 
         SuggestedTrack {
             track_id: track.id,