diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
index ca03130e6..e8ee88d68 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
@@ -13,8 +13,9 @@ public CleanupOrphanedHistoryItems(IMainDatabase database)
 
         public void Clean()
         {
-            CleanupOrphanedBySeries();
-            CleanupOrphanedByEpisode();
+            //CleanupOrphanedBySeries();
+            //CleanupOrphanedByEpisode();
+            CleanupOrphanedByMovie();
         }
 
         private void CleanupOrphanedBySeries()
@@ -29,6 +30,18 @@ LEFT OUTER JOIN Series
                                      WHERE Series.Id IS NULL)");
         }
 
+        private void CleanupOrphanedByMovie()
+        {
+            var mapper = _database.GetDataMapper();
+
+            mapper.ExecuteNonQuery(@"DELETE FROM History
+                                     WHERE Id IN (
+                                     SELECT History.Id FROM History
+                                     LEFT OUTER JOIN Movies
+                                     ON History.MovieId = Movies.Id
+                                     WHERE Movies.Id IS NULL)");
+        }
+
         private void CleanupOrphanedByEpisode()
         {
             var mapper = _database.GetDataMapper();