diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 8b95a6d9b..4f4ec3871 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -808,7 +808,8 @@ def _real_main(argv=None):
         if opts.xattrs:
             ydl.add_post_processor(XAttrMetadataPP())
         if opts.embedthumbnail:
-            ydl.add_post_processor(FFmpegAudioFixPP())
+            if not opts.addmetadata:
+                ydl.add_post_processor(FFmpegAudioFixPP())
             ydl.add_post_processor(AtomicParsleyPP())
 
         # Update version