diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedTrackFiles.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedTrackFiles.cs
index 62286c667..e4d9f3845 100644
--- a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedTrackFiles.cs
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedTrackFiles.cs
@@ -13,6 +13,12 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
         }
 
         public void Clean()
+        {
+            CleanupOrphanedByAlbum();
+            CleanupOrphanedByTracks();
+        }
+
+        private void CleanupOrphanedByAlbum()
         {
             using (var mapper = _database.OpenConnection())
             {
@@ -24,7 +30,13 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
                                      LEFT OUTER JOIN ""Tracks""
                                      ON ""TrackFiles"".""Id"" = ""Tracks"".""TrackFileId""
                                      WHERE ""Tracks"".""Id"" IS NULL)");
+            }
+        }
 
+        private void CleanupOrphanedByTracks()
+        {
+            using (var mapper = _database.OpenConnection())
+            {
                 // Unlink Tracks where the Trackfiles entry no longer exists
                 mapper.Execute(@"UPDATE ""Tracks""
                                      SET ""TrackFileId"" = 0