diff --git a/src/NzbDrone.Core/History/EntityHistoryService.cs b/src/NzbDrone.Core/History/EntityHistoryService.cs
index a84f24dc9..8402f8731 100644
--- a/src/NzbDrone.Core/History/EntityHistoryService.cs
+++ b/src/NzbDrone.Core/History/EntityHistoryService.cs
@@ -184,6 +184,11 @@ namespace NzbDrone.Core.History
 
         public void Handle(AlbumImportIncompleteEvent message)
         {
+            if (message.TrackedDownload.RemoteAlbum == null)
+            {
+                return;
+            }
+
             foreach (var album in message.TrackedDownload.RemoteAlbum.Albums)
             {
                 var history = new EntityHistory
@@ -266,6 +271,11 @@ namespace NzbDrone.Core.History
 
         public void Handle(DownloadCompletedEvent message)
         {
+            if (message.TrackedDownload.RemoteAlbum == null)
+            {
+                return;
+            }
+
             foreach (var album in message.TrackedDownload.RemoteAlbum.Albums)
             {
                 var history = new EntityHistory