diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index 2f9e2135c..1811cbaf1 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -620,14 +620,15 @@ def album_candidates(items, artist, album, va_likely, extra_tags):
     constrain the search.
     """
 
-    common_args = [album, len(items), extra_tags]
     # Base candidates if we have album and artist to match.
     if artist and album:
-        yield from invoke_mb(mb.match_album, artist, *common_args)
+        yield from invoke_mb(mb.match_album, artist, album, len(items),
+                             extra_tags)
 
     # Also add VA matches from MusicBrainz where appropriate.
     if va_likely and album:
-        yield from invoke_mb(mb.match_album, None, *common_args)
+        yield from invoke_mb(mb.match_album, None, album, len(items),
+                             extra_tags)
 
     # Candidates from plugins.
     yield from plugins.candidates(items, artist, album, va_likely, extra_tags)