diff --git a/src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs
index de561469a..b3e5783fa 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs
@@ -68,5 +68,16 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             VerifyNoUpdate();
         }
+
+        [Test]
+        public void should_not_record_failure_for_unknown_provider()
+        {
+            Subject.RecordFailure(0);
+
+            Mocker.GetMock<IIndexerStatusRepository>()
+                .Verify(v => v.FindByProviderId(1), Times.Never);
+
+            VerifyNoUpdate();
+        }
     }
 }
diff --git a/src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs b/src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs
index 15cf84d3b..40c353b24 100644
--- a/src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs
+++ b/src/NzbDrone.Core/ThingiProvider/Status/ProviderStatusServiceBase.cs
@@ -79,6 +79,11 @@ namespace NzbDrone.Core.ThingiProvider.Status
 
         protected virtual void RecordFailure(int providerId, TimeSpan minimumBackOff, bool escalate)
         {
+            if (providerId <= 0)
+            {
+                return;
+            }
+
             lock (_syncRoot)
             {
                 var status = GetProviderStatus(providerId);