diff --git a/app/ytdl.py b/app/ytdl.py
index 0a74b14..3c21e0e 100644
--- a/app/ytdl.py
+++ b/app/ytdl.py
@@ -234,7 +234,7 @@ class DownloadQueue:
             if not self.queue.exists(entry['id']):
                 dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'], quality, format, folder)
                 # Keep consistent with frontend
-                base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format != 'mp3') else self.config.AUDIO_DOWNLOAD_DIR
+                base_directory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format  not in ("m4a", "mp3")) else self.config.AUDIO_DOWNLOAD_DIR
                 if folder:
                     if not self.config.CUSTOM_DIRS:
                         return {'status': 'error', 'msg': f'A folder for the download was specified but CUSTOM_DIRS is not true in the configuration.'}
diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts
index 7038b68..5cbb84c 100644
--- a/ui/src/app/app.component.ts
+++ b/ui/src/app/app.component.ts
@@ -94,7 +94,7 @@ export class AppComponent implements AfterViewInit {
   }
 
   isAudioType() {
-    return this.quality == 'audio' || this.format == 'mp3';
+    return this.quality == 'audio' || this.format == 'mp3'  || this.format == 'm4a';
   }
 
   getMatchingCustomDir() : Observable<string[]> {