diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index 0bd47f1e6..804a37db8 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -595,8 +595,12 @@ def album_info(release: Dict) -> beets.autotag.hooks.AlbumInfo:
 
     # Media (format).
     if release["medium-list"]:
-        first_medium = release["medium-list"][0]
-        info.media = first_medium.get("format")
+        # If all media are the same, use that medium name
+        if len(set([x.get("format") for x in release["medium-list"]])) == 1:
+            info.media = release["medium-list"][0].get("format")
+        # Otherwise, let's just call it "Media"
+        else:
+            info.media = "Media"
 
     if config["musicbrainz"]["genres"]:
         sources = [
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 87fc00782..67c03f7d6 100755
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -453,14 +453,14 @@ class ChangeRepresentation(object):
 
     def make_medium_info_line(self, track_info):
         """Construct a line with the current medium's info."""
-        media = self.match.info.media or "Media"
+        track_media = track_info.get("media", "Media")
         # Build output string.
         if self.match.info.mediums > 1 and track_info.disctitle:
-            return f"* {media} {track_info.medium}: {track_info.disctitle}"
+            return f"* {track_media} {track_info.medium}: {track_info.disctitle}"
         elif self.match.info.mediums > 1:
-            return f"* {media} {track_info.medium}"
+            return f"* {track_media} {track_info.medium}"
         elif track_info.disctitle:
-            return f"* {media}: {track_info.disctitle}"
+            return f"* {track_media}: {track_info.disctitle}"
         else:
             return ""