diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index 90c2013d8..19d26a9f6 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -104,8 +104,11 @@ BROWSE_MAXTRACKS = 500
 TRACK_INCLUDES = ["artists", "aliases", "isrcs"]
 if "work-level-rels" in musicbrainzngs.VALID_INCLUDES["recording"]:
     TRACK_INCLUDES += ["work-level-rels", "artist-rels"]
-if "genres" in musicbrainzngs.VALID_INCLUDES["recording"]:
-    RELEASE_INCLUDES += ["genres"]
+if "tags" in [
+    musicbrainzngs.VALID_INCLUDES["release"],
+    musicbrainzngs.VALID_INCLUDES["release-group"],
+]:
+    RELEASE_INCLUDES += ["tags"]
 
 
 def track_url(trackid: str) -> str:
@@ -607,8 +610,8 @@ def album_info(release: dict) -> beets.autotag.hooks.AlbumInfo:
 
     if config["musicbrainz"]["genres"]:
         sources = [
-            release["release-group"].get("genre-list", []),
-            release.get("genre-list", []),
+            release["release-group"].get("tag-list", []),
+            release.get("tag-list", []),
         ]
         genres: Counter[str] = Counter()
         for source in sources: