diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
index a86ad18d..3331c486 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
@@ -1270,7 +1270,25 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
                         }
 
 
-                        metadataCommands.addOption("--parse-metadata", "%(album_artist,first_artist|)s:%(album_artist)s")
+                        val allArtistsInAlbumArtist = sharedPreferences.getBoolean("all_artists_in_album_artist", false)
+
+                        if (allArtistsInAlbumArtist) {
+                            if (emptyAuthor) {
+                                if (usePlaylistMetadata) {
+                                    metadataCommands.addOption("--parse-metadata", "%(album_artist,playlist_uploader,artist,uploader|)s:%(album_artist)s")
+                                } else {
+                                    metadataCommands.addOption("--parse-metadata", "%(album_artist,artist,uploader|)s:%(album_artist)s")
+                                }
+                            } else {
+                                if (usePlaylistMetadata) {
+                                    metadataCommands.addOption("--parse-metadata", "%(album_artist,playlist_uploader,artist|)s:%(album_artist)s")
+                                } else {
+                                    metadataCommands.addOption("--parse-metadata", "%(album_artist,artist|)s:%(album_artist)s")
+                                }
+                            }
+                        } else {
+                            metadataCommands.addOption("--parse-metadata", "%(album_artist,first_artist|)s:%(album_artist)s")
+                        }
                         metadataCommands.addOption("--parse-metadata", "%(release_year,release_date>%Y,upload_date>%Y)s:(?P<meta_date>\\d+)")
 
                         if (isPlaylistItem) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4c05f41..c57f1eb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,10 @@
     <string name="add_chapters_summary">Mark YouTube / SponsorBlock segments as chapters for the video</string>
     <string name="save_thumb">Save thumbnail</string>
     <string name="save_thumb_summary">Save the thumbnail in the download folder</string>
+    <string name="audio_default">Audio Defaults</string>
+    <string name="all_artists_in_album_artist">Save all artists in Album Artist</string>
+    <string name="all_artists_in_album_artist_summary">Instead of just the first artist, save all artists to the Album Artist metadata</string>
+    <string name="video_default">Video Defaults</string>
     <string name="audio_format">Audio format</string>
     <string name="video_format">Video format</string>
     <string name="audio_quality">Audio quality</string>
diff --git a/app/src/main/res/xml/processing_preferences.xml b/app/src/main/res/xml/processing_preferences.xml
index efb59e26..5129cdaa 100644
--- a/app/src/main/res/xml/processing_preferences.xml
+++ b/app/src/main/res/xml/processing_preferences.xml
@@ -67,6 +67,14 @@
             app:summary="@string/embed_metadata_summary"
             app:title="@string/embed_metadata" />
 
+        <SwitchPreferenceCompat
+            android:widgetLayout="@layout/preferece_material_switch"
+            app:defaultValue="false"
+            app:icon="@drawable/baseline_video_metadata"
+            app:key="all_artists_in_album_artist"
+            app:summary="@string/all_artists_in_album_artist_summary"
+            app:title="@string/all_artists_in_album_artist" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/audio">