diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDuplicateMetadataFiles.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDuplicateMetadataFiles.cs
index 57ae7e2cc..fcdf8fcd8 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDuplicateMetadataFiles.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDuplicateMetadataFiles.cs
@@ -16,7 +16,7 @@ public void Clean()
         {
             DeleteDuplicateArtistMetadata();
             DeleteDuplicateBookMetadata();
-            DeleteDuplicateBookImages();
+            DeleteDuplicateBookFileMetadata();
         }
 
         private void DeleteDuplicateArtistMetadata()
@@ -40,21 +40,21 @@ private void DeleteDuplicateBookMetadata()
                 mapper.Execute(@"DELETE FROM MetadataFiles
                                          WHERE Id IN (
                                          SELECT Id FROM MetadataFiles
-                                         WHERE Type = 2
-                                         GROUP BY BookFileId, Consumer
-                                         HAVING COUNT(BookFileId) > 1
+                                         WHERE Type IN (2, 4)
+                                         GROUP BY BookId, Consumer
+                                         HAVING COUNT(BookId) > 1
                                      )");
             }
         }
 
-        private void DeleteDuplicateBookImages()
+        private void DeleteDuplicateBookFileMetadata()
         {
             using (var mapper = _database.OpenConnection())
             {
                 mapper.Execute(@"DELETE FROM MetadataFiles
                                          WHERE Id IN (
                                          SELECT Id FROM MetadataFiles
-                                         WHERE Type = 4
+                                         WHERE Type IN (2, 4)
                                          GROUP BY BookFileId, Consumer
                                          HAVING COUNT(BookFileId) > 1
                                      )");
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
index f33003c05..34d0132e0 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
@@ -69,7 +69,7 @@ private void DeleteWhereBookIdIsZero()
                 mapper.Execute(@"DELETE FROM MetadataFiles
                                      WHERE Id IN (
                                      SELECT Id FROM MetadataFiles
-                                     WHERE Type IN (4, 6)
+                                     WHERE Type IN (2, 4)
                                      AND BookId = 0)");
             }
         }
@@ -81,7 +81,7 @@ private void DeleteWhereTrackFileIsZero()
                 mapper.Execute(@"DELETE FROM MetadataFiles
                                      WHERE Id IN (
                                      SELECT Id FROM MetadataFiles
-                                     WHERE Type IN (2, 5)
+                                     WHERE Type IN (2, 4)
                                      AND BookFileId = 0)");
             }
         }