diff --git a/src/NzbDrone.Core/Movies/MovieService.cs b/src/NzbDrone.Core/Movies/MovieService.cs
index 35e1a964b..b1017e487 100644
--- a/src/NzbDrone.Core/Movies/MovieService.cs
+++ b/src/NzbDrone.Core/Movies/MovieService.cs
@@ -19,7 +19,6 @@ namespace NzbDrone.Core.Movies
     {
         Movie GetMovie(int movieId);
         List<Movie> GetMovies(IEnumerable<int> movieIds);
-        PagingSpec<Movie> Paged(PagingSpec<Movie> pagingSpec);
         Movie AddMovie(Movie newMovie);
         List<Movie> AddMovies(List<Movie> newMovies);
         Movie FindByImdbId(string imdbid);
@@ -79,11 +78,6 @@ namespace NzbDrone.Core.Movies
             return _movieRepository.Get(movieIds).ToList();
         }
 
-        public PagingSpec<Movie> Paged(PagingSpec<Movie> pagingSpec)
-        {
-            return _movieRepository.GetPaged(pagingSpec);
-        }
-
         public Movie AddMovie(Movie newMovie)
         {
             _movieRepository.Insert(newMovie);
diff --git a/src/NzbDrone.Core/Movies/RefreshMovieService.cs b/src/NzbDrone.Core/Movies/RefreshMovieService.cs
index f0ed8365d..7d807abae 100644
--- a/src/NzbDrone.Core/Movies/RefreshMovieService.cs
+++ b/src/NzbDrone.Core/Movies/RefreshMovieService.cs
@@ -203,7 +203,7 @@ namespace NzbDrone.Core.Movies
             }
             else
             {
-                var allMovie = _movieService.GetAllMovies().OrderBy(c => c.SortTitle).ToList();
+                var scanMovies = new List<Movie>();
 
                 var updatedTMDBMovies = new HashSet<int>();
 
@@ -212,7 +212,16 @@ namespace NzbDrone.Core.Movies
                     updatedTMDBMovies = _movieInfo.GetChangedMovies(message.LastStartTime.Value);
                 }
 
-                foreach (var movie in allMovie)
+                if (_configService.RescanAfterRefresh == RescanAfterRefreshType.Never || (_configService.RescanAfterRefresh == RescanAfterRefreshType.AfterManual && message.Trigger == CommandTrigger.Scheduled))
+                {
+                    scanMovies = _movieService.FindByTmdbId(updatedTMDBMovies.ToList()).OrderBy(c => c.SortTitle).ToList();
+                }
+                else
+                {
+                    scanMovies = _movieService.GetAllMovies().OrderBy(c => c.SortTitle).ToList();
+                }
+
+                foreach (var movie in scanMovies)
                 {
                     if ((updatedTMDBMovies.Count == 0 && _checkIfMovieShouldBeRefreshed.ShouldRefresh(movie)) || updatedTMDBMovies.Contains(movie.TmdbId) || message.Trigger == CommandTrigger.Manual)
                     {