diff --git a/src/music_kraken/objects/song.py b/src/music_kraken/objects/song.py
index 56a11e8..3716b03 100644
--- a/src/music_kraken/objects/song.py
+++ b/src/music_kraken/objects/song.py
@@ -125,7 +125,7 @@ class Song(MainObject):
             id3Mapping.TRACKNUMBER: [self.tracksort_str]
         })
 
-        metadata.merge_many([s.metadata for s in self.source_collection])
+        # metadata.merge_many([s.get_song_metadata() for s in self.source_collection])  album sources have no relevant metadata for id3
         metadata.merge_many([a.metadata for a in self.album_collection])
         metadata.merge_many([a.metadata for a in self.main_artist_collection])
         metadata.merge_many([a.metadata for a in self.feature_artist_collection])
diff --git a/src/music_kraken/objects/source.py b/src/music_kraken/objects/source.py
index e55c08c..2d37f59 100644
--- a/src/music_kraken/objects/source.py
+++ b/src/music_kraken/objects/source.py
@@ -97,13 +97,7 @@ class Source(DatabaseObject):
 
     @property
     def metadata(self) -> Metadata:
-        if self.type_enum == SourceTypes.SONG:
-            return self.get_song_metadata()
-
-        if self.type_enum == SourceTypes.ARTIST:
-            return self.get_artist_metadata()
-
-        return super().metadata
+        return self.get_song_metadata()
 
     @property
     def indexing_values(self) -> List[Tuple[str, object]]: