diff --git a/funkwhale_api/downloader/downloader.py b/funkwhale_api/downloader/downloader.py
index 854d0d0b9bd6b40d08ac5873ce0b4aa4913221de..b35ed6f7d1c73ab99b9d0b0676e77743c80c10d3 100644
--- a/funkwhale_api/downloader/downloader.py
+++ b/funkwhale_api/downloader/downloader.py
@@ -11,7 +11,6 @@ def download(
         url,
         target_directory=settings.MEDIA_ROOT,
         name="%(id)s.%(ext)s",
-        extension='vorbis',
         bitrate=192):
     target_path = os.path.join(target_directory, name)
     ydl_opts = {
@@ -19,10 +18,10 @@ def download(
         'outtmpl': target_path,
         'postprocessors': [{
             'key': 'FFmpegExtractAudio',
-            'preferredcodec': extension,
+            'preferredcodec': 'vorbis',
         }],
     }
     _downloader = youtube_dl.YoutubeDL(ydl_opts)
     info = _downloader.extract_info(url)
-    info['audio_file_path'] = target_path.format(**info)
+    info['audio_file_path'] = target_path % {'id': info['id'], 'ext': 'ogg'}
     return info
diff --git a/funkwhale_api/downloader/tests/test_downloader.py b/funkwhale_api/downloader/tests/test_downloader.py
index 77164d5e17507ccb58ee40b432e12e9f24712ab1..7cfaa63c83e40f040aaa4f21de1a519c74d18582 100644
--- a/funkwhale_api/downloader/tests/test_downloader.py
+++ b/funkwhale_api/downloader/tests/test_downloader.py
@@ -8,6 +8,7 @@ class TestDownloader(TMPDirTestCaseMixin, TestCase):
 
     def test_can_download_audio_from_youtube_url_to_vorbis(self):
         data = downloader.download('https://www.youtube.com/watch?v=tPEE9ZwTmy0', target_directory=self.download_dir)
-        self.assertTrue(
-            os.path.exists(os.path.join(self.download_dir, 'tPEE9ZwTmy0.ogg'))
-        )
+        self.assertEqual(
+            data['audio_file_path'],
+            os.path.join(self.download_dir, 'tPEE9ZwTmy0.ogg'))
+        self.assertTrue(os.path.exists(data['audio_file_path']))