diff --git a/lib/providers/download_queue_provider.dart b/lib/providers/download_queue_provider.dart
index e99151ff..7ac7453a 100644
--- a/lib/providers/download_queue_provider.dart
+++ b/lib/providers/download_queue_provider.dart
@@ -2080,6 +2080,14 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
         return _joinRelativePath(playlistPrefix, '$artistName/$albumName');
       }
 
+      if (albumFolderStructure == 'artist_album_flat') {
+        if (isSingle) {
+          return _joinRelativePath(playlistPrefix, artistName);
+        }
+        final albumName = _sanitizeFolderName(track.albumName);
+        return _joinRelativePath(playlistPrefix, '$artistName/$albumName');
+      }
+
       if (isSingle) {
         return _joinRelativePath(playlistPrefix, 'Singles');
       }