diff --git a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
index 8b4dae447..01bf410c7 100644
--- a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
+++ b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
@@ -114,11 +114,11 @@ public AudioTag GetTrackMetadata(TrackFile trackfile)
                 DiscCount = (uint)release.Media.Count,
 
                 // We may have omitted media so index in the list isn't the same as medium number
-                Media = release.Media.SingleOrDefault(x => x.Number == track.MediumNumber).Format,
+                Media = release.Media.SingleOrDefault(x => x.Number == track.MediumNumber)?.Format,
                 Date = release.ReleaseDate,
-                Year = (uint)album.ReleaseDate?.Year,
+                Year = (uint)(album.ReleaseDate?.Year ?? 0),
                 OriginalReleaseDate = album.ReleaseDate,
-                OriginalYear = (uint)album.ReleaseDate?.Year,
+                OriginalYear = (uint)(album.ReleaseDate?.Year ?? 0),
                 Publisher = release.Label.FirstOrDefault(),
                 Genres = album.Genres.Any() ? album.Genres.ToArray() : artist.Genres.ToArray(),
                 ImageFile = imageFile,