diff --git a/core/metadata.py b/core/metadata.py
index 34b8fe9..ca295ec 100755
--- a/core/metadata.py
+++ b/core/metadata.py
@@ -148,5 +148,6 @@ class EmbedMetadata:
             albumart.close()
         except IndexError:
             pass
+
         audiofile.save()
         return True
diff --git a/spotdl.py b/spotdl.py
index 6159516..d3252f6 100755
--- a/spotdl.py
+++ b/spotdl.py
@@ -142,6 +142,11 @@ def grab_single(raw_song, number=None):
             log.info('Found No metadata. Skipping the download')
             return
 
+    if args.download_only_metadata:
+        if meta_tags is None:
+            log.info('Found No metadata. Skipping the download')
+            return
+
     if content is None:
         log.debug('Found no matching video')
         return