diff --git a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
index 8b4dae447..e4a0384fa 100644
--- a/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
+++ b/src/NzbDrone.Core/MediaFiles/AudioTagService.cs
@@ -115,8 +115,8 @@ public AudioTag GetTrackMetadata(TrackFile trackfile)
 
                 // 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,
-                Date = release.ReleaseDate,
-                Year = (uint)album.ReleaseDate?.Year,
+                Date = release.ReleaseDate ?? album.ReleaseDate,
+                Year = (uint)(album.ReleaseDate?.Year ?? release.ReleaseDate?.Year ?? 0),
                 OriginalReleaseDate = album.ReleaseDate,
                 OriginalYear = (uint)album.ReleaseDate?.Year,
                 Publisher = release.Label.FirstOrDefault(),