diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py
index d015e4201..8c950c521 100644
--- a/beetsplug/discogs.py
+++ b/beetsplug/discogs.py
@@ -157,6 +157,11 @@ class DiscogsPlugin(BeetsPlugin):
         if not self.discogs_client:
             return
 
+        if not album and not artist:
+            self._log.debug('Skipping Discogs query. Files missing album and '
+                            'artist tags.')
+            return []
+
         if va_likely:
             query = album
         else: