diff --git a/src/NzbDrone.Core/HealthCheck/Checks/IndexerProxyCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/IndexerProxyCheck.cs
index a78061561..484f2bc19 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/IndexerProxyCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/IndexerProxyCheck.cs
@@ -22,16 +22,18 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public override HealthCheck Check()
         {
-            var enabledProviders = _proxyFactory.GetAvailableProviders();
+            var enabledProxies = _proxyFactory.GetAvailableProviders()
+                .Where(n => ((IndexerProxyDefinition)n.Definition).Enable)
+                .ToList();
 
-            var badProxies = enabledProviders.Where(p => p.Test().IsValid == false).ToList();
+            var badProxies = enabledProxies.Where(p => p.Test().IsValid == false).ToList();
 
-            if (enabledProviders.Empty() || badProxies.Count == 0)
+            if (enabledProxies.Empty() || badProxies.Count == 0)
             {
                 return new HealthCheck(GetType());
             }
 
-            if (badProxies.Count == enabledProviders.Count)
+            if (badProxies.Count == enabledProxies.Count)
             {
                 return new HealthCheck(GetType(),
                     HealthCheckResult.Error,
diff --git a/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs b/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs
index 9974c1f7f..b82251d6e 100644
--- a/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs
+++ b/src/NzbDrone.Core/IndexerProxies/HttpIndexerProxyBase.cs
@@ -31,8 +31,8 @@ namespace NzbDrone.Core.IndexerProxies
             var failures = new List<ValidationFailure>();
 
             var request = PreRequest(_cloudRequestBuilder.Create()
-                                              .Resource("/ping")
-                                              .Build());
+                .Resource("/ping")
+                .Build());
 
             try
             {