diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
index a5ecbeb74..d89f3aa42 100644
--- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
             environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
             environmentVariables.Add("Radarr_Movie_Title", movie.Title);
             environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId.ToString());
-            //environmentVariables.Add("Radarr_MovieFile_Id", movieFile.Id.ToString());  TODO: Debug issue with moviefile ID and add back later
+            environmentVariables.Add("Radarr_MovieFile_Id", movieFile.Id.ToString());
             environmentVariables.Add("Radarr_MovieFile_RelativePath", movieFile.RelativePath);
             environmentVariables.Add("Radarr_MovieFile_Path", Path.Combine(movie.Path, movieFile.RelativePath));
             environmentVariables.Add("Radarr_MovieFile_Quality", movieFile.Quality.Quality.Name);
diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs
index eefef7653..53c237159 100644
--- a/src/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationService.cs
@@ -213,7 +213,9 @@ namespace NzbDrone.Core.Notifications
             downloadMessage.Message = GetMessage(message.Movie.Movie, message.Movie.Quality);
             downloadMessage.Series = null;
             downloadMessage.EpisodeFile = null;
+            downloadMessage.MovieFile = message.MovieFile;
             downloadMessage.Movie = message.Movie.Movie;
+            downloadMessage.OldFiles = null;
             downloadMessage.OldMovieFiles = message.OldFiles;
             downloadMessage.SourcePath = message.Movie.Path;