diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatusFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatusFixture.cs
new file mode 100644
index 000000000..35a6ea275
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatusFixture.cs
@@ -0,0 +1,54 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Applications;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class CleanupOrphanedApplicationFixture : DbTest<CleanupOrphanedApplicationStatus, ApplicationStatus>
+    {
+        private ApplicationDefinition _application;
+
+        [SetUp]
+        public void Setup()
+        {
+            _application = Builder<ApplicationDefinition>.CreateNew()
+                                                         .BuildNew();
+        }
+
+        private void GivenApplication()
+        {
+            Db.Insert(_application);
+        }
+
+        [Test]
+        public void should_delete_orphaned_applicationstatus()
+        {
+            var status = Builder<ApplicationStatus>.CreateNew()
+                                                   .With(h => h.ProviderId = _application.Id)
+                                                   .BuildNew();
+            Db.Insert(status);
+
+            Subject.Clean();
+            AllStoredModels.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_not_delete_unorphaned_applicationstatus()
+        {
+            GivenApplication();
+
+            var status = Builder<ApplicationStatus>.CreateNew()
+                                                   .With(h => h.ProviderId = _application.Id)
+                                                   .BuildNew();
+            Db.Insert(status);
+
+            Subject.Clean();
+            AllStoredModels.Should().HaveCount(1);
+            AllStoredModels.Should().Contain(h => h.ProviderId == _application.Id);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatusFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatusFixture.cs
new file mode 100644
index 000000000..da8e94f1e
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatusFixture.cs
@@ -0,0 +1,56 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients.Flood;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class CleanupOrphanedDownloadClientStatusFixture : DbTest<CleanupOrphanedDownloadClientStatus, DownloadClientStatus>
+    {
+        private DownloadClientDefinition _downloadClient;
+
+        [SetUp]
+        public void Setup()
+        {
+            _downloadClient = Builder<DownloadClientDefinition>.CreateNew()
+                                                               .With(c => c.Settings = new FloodSettings())
+                                                               .BuildNew();
+        }
+
+        private void GivenClient()
+        {
+            Db.Insert(_downloadClient);
+        }
+
+        [Test]
+        public void should_delete_orphaned_downloadclientstatus()
+        {
+            var status = Builder<DownloadClientStatus>.CreateNew()
+                                                      .With(h => h.ProviderId = _downloadClient.Id)
+                                                      .BuildNew();
+            Db.Insert(status);
+
+            Subject.Clean();
+            AllStoredModels.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_not_delete_unorphaned_downloadclientstatus()
+        {
+            GivenClient();
+
+            var status = Builder<DownloadClientStatus>.CreateNew()
+                                                      .With(h => h.ProviderId = _downloadClient.Id)
+                                                      .BuildNew();
+            Db.Insert(status);
+
+            Subject.Clean();
+            AllStoredModels.Should().HaveCount(1);
+            AllStoredModels.Should().Contain(h => h.ProviderId == _downloadClient.Id);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureApplicationStatusTimesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureApplicationStatusTimesFixture.cs
new file mode 100644
index 000000000..861b0538c
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureApplicationStatusTimesFixture.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Applications;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.ThingiProvider.Status;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class FixFutureApplicationStatusTimesFixture : CoreTest<FixFutureApplicationStatusTimes>
+    {
+        [Test]
+        public void should_set_disabled_till_when_its_too_far_in_the_future()
+        {
+            var disabledTillTime = EscalationBackOff.Periods[1];
+            var applicationStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.EscalationLevel = 1)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(applicationStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<ApplicationStatus>>(i => i.All(
+                              s => s.DisabledTill.Value <= DateTime.UtcNow.AddMinutes(disabledTillTime)))));
+        }
+
+        [Test]
+        public void should_set_initial_failure_when_its_in_the_future()
+        {
+            var applicationStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.EscalationLevel = 1)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(applicationStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<ApplicationStatus>>(i => i.All(
+                              s => s.InitialFailure.Value <= DateTime.UtcNow))));
+        }
+
+        [Test]
+        public void should_set_most_recent_failure_when_its_in_the_future()
+        {
+            var applicationStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(5))
+                                                        .With(t => t.EscalationLevel = 1)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(applicationStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<ApplicationStatus>>(i => i.All(
+                              s => s.MostRecentFailure.Value <= DateTime.UtcNow))));
+        }
+
+        [Test]
+        public void should_not_change_statuses_when_times_are_in_the_past()
+        {
+            var indexerStatuses = Builder<ApplicationStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.EscalationLevel = 0)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(indexerStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IApplicationStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<ApplicationStatus>>(i => i.Count == 0)));
+        }
+    }
+}
diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs
new file mode 100644
index 000000000..712849e69
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/FixFutureDownloadClientStatusTimesFixture.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.ThingiProvider.Status;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class FixFutureDownloadClientStatusTimesFixture : CoreTest<FixFutureDownloadClientStatusTimes>
+    {
+        [Test]
+        public void should_set_disabled_till_when_its_too_far_in_the_future()
+        {
+            var disabledTillTime = EscalationBackOff.Periods[1];
+            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.EscalationLevel = 1)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(clientStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<DownloadClientStatus>>(i => i.All(
+                              s => s.DisabledTill.Value <= DateTime.UtcNow.AddMinutes(disabledTillTime)))));
+        }
+
+        [Test]
+        public void should_set_initial_failure_when_its_in_the_future()
+        {
+            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.EscalationLevel = 1)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(clientStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<DownloadClientStatus>>(i => i.All(
+                              s => s.InitialFailure.Value <= DateTime.UtcNow))));
+        }
+
+        [Test]
+        public void should_set_most_recent_failure_when_its_in_the_future()
+        {
+            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(5))
+                                                        .With(t => t.EscalationLevel = 1)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(clientStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<DownloadClientStatus>>(i => i.All(
+                              s => s.MostRecentFailure.Value <= DateTime.UtcNow))));
+        }
+
+        [Test]
+        public void should_not_change_statuses_when_times_are_in_the_past()
+        {
+            var clientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
+                                                        .All()
+                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
+                                                        .With(t => t.EscalationLevel = 0)
+                                                        .BuildListOfNew();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Setup(s => s.All())
+                  .Returns(clientStatuses);
+
+            Subject.Clean();
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                  .Verify(v => v.UpdateMany(
+                          It.Is<List<DownloadClientStatus>>(i => i.Count == 0)));
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatus.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatus.cs
new file mode 100644
index 000000000..86e4cd2a5
--- /dev/null
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedApplicationStatus.cs
@@ -0,0 +1,27 @@
+using Dapper;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Housekeeping.Housekeepers
+{
+    public class CleanupOrphanedApplicationStatus : IHousekeepingTask
+    {
+        private readonly IMainDatabase _database;
+
+        public CleanupOrphanedApplicationStatus(IMainDatabase database)
+        {
+            _database = database;
+        }
+
+        public void Clean()
+        {
+            var mapper = _database.OpenConnection();
+
+            mapper.Execute(@"DELETE FROM ""ApplicationStatus""
+                                     WHERE ""Id"" IN (
+                                     SELECT ""ApplicationStatus"".""Id"" FROM ""ApplicationStatus""
+                                     LEFT OUTER JOIN ""Applications""
+                                     ON ""ApplicationStatus"".""ProviderId"" = ""Applications"".""Id""
+                                     WHERE ""Applications"".""Id"" IS NULL)");
+        }
+    }
+}