diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
index d69d03b30..cae6930ce 100644
--- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
         public override void OnGrab(GrabMessage message)
         {
             var artist = message.Artist;
-            var remoteAlbum = message.Album;
+            var remoteAlbum = message.RemoteAlbum;
             var releaseGroup = remoteAlbum.ParsedAlbumInfo.ReleaseGroup;
             var environmentVariables = new StringDictionary();
 
diff --git a/src/NzbDrone.Core/Notifications/Discord/Discord.cs b/src/NzbDrone.Core/Notifications/Discord/Discord.cs
index 8e170e4ab..126e3240b 100644
--- a/src/NzbDrone.Core/Notifications/Discord/Discord.cs
+++ b/src/NzbDrone.Core/Notifications/Discord/Discord.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Notifications.Discord
         public override void OnGrab(GrabMessage message)
         {
             var artist = message.Artist;
-            var albums = message.Album.Albums;
+            var albums = message.RemoteAlbum.Albums;
             var artistMetadata = message.Artist.Metadata.Value;
 
             var embed = new Embed
@@ -86,16 +86,16 @@ namespace NzbDrone.Core.Notifications.Discord
                         break;
                     case DiscordGrabFieldType.Group:
                         discordField.Name = "Group";
-                        discordField.Value = message.Album.ParsedAlbumInfo.ReleaseGroup;
+                        discordField.Value = message.RemoteAlbum.ParsedAlbumInfo.ReleaseGroup;
                         break;
                     case DiscordGrabFieldType.Size:
                         discordField.Name = "Size";
-                        discordField.Value = BytesToString(message.Album.Release.Size);
+                        discordField.Value = BytesToString(message.RemoteAlbum.Release.Size);
                         discordField.Inline = true;
                         break;
                     case DiscordGrabFieldType.Release:
                         discordField.Name = "Release";
-                        discordField.Value = string.Format("```{0}```", message.Album.Release.Title);
+                        discordField.Value = string.Format("```{0}```", message.RemoteAlbum.Release.Title);
                         break;
                     case DiscordGrabFieldType.Links:
                         discordField.Name = "Links";
diff --git a/src/NzbDrone.Core/Notifications/GrabMessage.cs b/src/NzbDrone.Core/Notifications/GrabMessage.cs
index c2845f270..165106d90 100644
--- a/src/NzbDrone.Core/Notifications/GrabMessage.cs
+++ b/src/NzbDrone.Core/Notifications/GrabMessage.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Core.Notifications
     {
         public string Message { get; set; }
         public Artist Artist { get; set; }
-        public RemoteAlbum Album { get; set; }
+        public RemoteAlbum RemoteAlbum { get; set; }
         public QualityModel Quality { get; set; }
         public string DownloadClientType { get; set; }
         public string DownloadClientName { get; set; }
diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs
index f440c227a..c910b2927 100644
--- a/src/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationService.cs
@@ -125,7 +125,7 @@ namespace NzbDrone.Core.Notifications
                 Message = GetMessage(message.Album.Artist, message.Album.Albums, message.Album.ParsedAlbumInfo.Quality),
                 Artist = message.Album.Artist,
                 Quality = message.Album.ParsedAlbumInfo.Quality,
-                Album = message.Album,
+                RemoteAlbum = message.Album,
                 DownloadClientName = message.DownloadClientName,
                 DownloadClientType = message.DownloadClient,
                 DownloadId = message.DownloadId
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
index 3fd3756d1..1f89aa6c8 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Notifications.Webhook
@@ -20,7 +21,7 @@ namespace NzbDrone.Core.Notifications.Webhook
 
         public WebhookGrabPayload BuildOnGrabPayload(GrabMessage message)
         {
-            var remoteAlbum = message.Album;
+            var remoteAlbum = message.RemoteAlbum;
             var quality = message.Quality;
 
             return new WebhookGrabPayload
@@ -28,6 +29,7 @@ namespace NzbDrone.Core.Notifications.Webhook
                 EventType = WebhookEventType.Grab,
                 InstanceName = _configFileProvider.InstanceName,
                 Artist = new WebhookArtist(message.Artist),
+                Albums = remoteAlbum.Albums.Select(x => new WebhookAlbum(x)).ToList(),
                 Release = new WebhookRelease(quality, remoteAlbum),
                 DownloadClient = message.DownloadClientName,
                 DownloadClientType = message.DownloadClientType,
@@ -44,6 +46,7 @@ namespace NzbDrone.Core.Notifications.Webhook
                 EventType = WebhookEventType.Download,
                 InstanceName = _configFileProvider.InstanceName,
                 Artist = new WebhookArtist(message.Artist),
+                Album = new WebhookAlbum(message.Album),
                 Tracks = trackFiles.SelectMany(x => x.Tracks.Value.Select(y => new WebhookTrack(y))).ToList(),
                 TrackFiles = trackFiles.ConvertAll(x => new WebhookTrackFile(x)),
                 IsUpgrade = message.OldFiles.Any(),
diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookImportPayload.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookImportPayload.cs
index e85c8306a..612a9bc01 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/WebhookImportPayload.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookImportPayload.cs
@@ -5,6 +5,7 @@ namespace NzbDrone.Core.Notifications.Webhook
     public class WebhookImportPayload : WebhookPayload
     {
         public WebhookArtist Artist { get; set; }
+        public WebhookAlbum Album { get; set; }
         public List<WebhookTrack> Tracks { get; set; }
         public List<WebhookTrackFile> TrackFiles { get; set; }
         public List<WebhookTrackFile> DeletedFiles { get; set; }