diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index 861d4ec9f..50e90b381 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -107,8 +107,6 @@ sealed class Music : Item {
      * Please don't try to do anything interesting with this and just assume it's a black box
      * that can only be compared, serialized, and deserialized.
      *
-     * TODO: MusicBrainz tags
-     *
      * @author OxygenCobalt
      */
     @Parcelize
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
index fdde267e5..8cfdf4580 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
@@ -303,13 +303,13 @@ class Task(context: Context, private val raw: Song.Raw) {
 
         // Artist
         tags["MUSICBRAINZ_ARTISTID"]?.let { raw.artistMusicBrainzIds = it }
-        tags["ARTIST"]?.let { raw.artistNames = it }
-        tags["ARTISTSORT"]?.let { raw.artistSortNames = it }
+        (tags["ARTISTS"] ?: tags["ARTIST"])?.let { raw.artistNames = it }
+        (tags["ARTISTS_SORT"] ?: tags["ARTISTSORT"])?.let { raw.artistSortNames = it }
 
         // Album artist
         tags["MUSICBRAINZ_ALBUMARTISTID"]?.let { raw.albumArtistMusicBrainzIds = it }
-        tags["ALBUMARTIST"]?.let { raw.albumArtistNames = it }
-        tags["ALBUMARTISTSORT"]?.let { raw.albumArtistSortNames = it }
+        (tags["ALBUMARTISTS"] ?: tags["ALBUMARTIST"])?.let { raw.albumArtistNames = it }
+        (tags["ALBUMARTISTS_SORT"] ?: tags["ALBUMARTISTSORT"])?.let { raw.albumArtistSortNames = it }
 
         // Genre
         tags["GENRE"]?.let { raw.genreNames = it }