diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
index c38b0e306..16893cce8 100644
--- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
@@ -126,6 +126,28 @@ namespace NzbDrone.Core.Download
                                     }
                                 }
                             }
+                            else
+                            {
+                                var parserResult = Parser.Parser.ParseMovieTitle(trackedDownload.DownloadItem.Title);
+                                if (parserResult != null)
+                                {
+                                    movie = _movieService.FindByTitle(parserResult.MovieTitle);
+                                    if (movie.MovieFile != null)
+                                    {
+                                        movie.MovieFile.LazyLoad();
+                                        if (movie.MovieFile.Value != null)
+                                        {
+                                            _logger.Debug("File Title: {0}, download item title: {1}", Parser.Parser.CleanSeriesTitle(movie.MovieFile.Value.RelativePath), Parser.Parser.CleanSeriesTitle(trackedDownload.DownloadItem.Title));
+                                            if (Parser.Parser.CleanSeriesTitle(movie.MovieFile.Value.RelativePath).Contains(Parser.Parser.CleanSeriesTitle(trackedDownload.DownloadItem.Title)))
+                                            {
+                                                trackedDownload.Warn("Seems like the movie already has a file associated with this download item. Maybe the History failed?");
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                                
+                            }
 
 
                             if (movie == null)