diff --git a/main.go b/main.go
index 6649c39..0584297 100644
--- a/main.go
+++ b/main.go
@@ -1153,7 +1153,7 @@ func writeMP4Tags(trackPath string, meta *structs.AutoGenerated, trackNum, track
 		t.AlbumSort = meta.Data[0].Attributes.Name
 		t.AlbumArtist = meta.Data[0].Attributes.ArtistName
 		t.AlbumArtistSort = meta.Data[0].Attributes.ArtistName
-	} else {
+	} else if strings.Contains(meta.Data[0].ID, "pl.") && Config.UseSongInfoForPlaylist {
 		t.DiscNumber = int16(meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber)
 		t.DiscTotal = int16(meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber)
 		t.TrackNumber = int16(meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber)
@@ -1162,6 +1162,13 @@ func writeMP4Tags(trackPath string, meta *structs.AutoGenerated, trackNum, track
 		t.AlbumSort = meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
 		t.AlbumArtist = meta.Data[0].Relationships.Tracks.Data[index].Attributes.ArtistName
 		t.AlbumArtistSort = meta.Data[0].Relationships.Tracks.Data[index].Attributes.ArtistName
+	} else {
+		t.DiscNumber = int16(meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber)
+		t.DiscTotal = int16(meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber)
+		t.TrackNumber = int16(meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber)
+		t.TrackTotal = int16(trackTotal)
+		t.Album = meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
+		t.AlbumSort = meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
 	}
 
 	if meta.Data[0].Relationships.Tracks.Data[index].Attributes.ContentRating == "explicit" {