diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 39bda7be4a..8a79c19afc 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -182,6 +182,7 @@
     <Compile Include="ProviderTests\RecycleBinProviderTests\DeleteDirectoryFixture.cs" />
     <Compile Include="NotificationTests\PlexProviderTest.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodesFixture.cs" />
+    <Compile Include="ThingiProviderTests\NullConfigFixture.cs" />
     <Compile Include="ThingiProvider\ProviderBaseFixture.cs" />
     <Compile Include="TvTests\RefreshEpisodeServiceFixture.cs" />
     <Compile Include="TvTests\EpisodeProviderTests\HandleEpisodeFileDeletedFixture.cs" />
diff --git a/NzbDrone.Core.Test/ThingiProviderTests/NullConfigFixture.cs b/NzbDrone.Core.Test/ThingiProviderTests/NullConfigFixture.cs
new file mode 100644
index 0000000000..0f47d9a918
--- /dev/null
+++ b/NzbDrone.Core.Test/ThingiProviderTests/NullConfigFixture.cs
@@ -0,0 +1,17 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.ThingiProvider;
+
+namespace NzbDrone.Core.Test.ThingiProviderTests
+{
+    [TestFixture]
+    public class NullConfigFixture : CoreTest<NullConfig>
+    {
+        [Test]
+        public void should_be_valid()
+        {
+            Subject.Validate().IsValid.Should().BeTrue();
+        }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Indexers/IndexerBase.cs b/NzbDrone.Core/Indexers/IndexerBase.cs
index ddedc098c1..41942d35b3 100644
--- a/NzbDrone.Core/Indexers/IndexerBase.cs
+++ b/NzbDrone.Core/Indexers/IndexerBase.cs
@@ -4,7 +4,7 @@
 
 namespace NzbDrone.Core.Indexers
 {
-    public abstract class IndexerBase<TSettings> : IIndexer
+    public abstract class IndexerBase<TSettings> : IIndexer where TSettings : IProviderConfig, new()
     {
         public Type ConfigContract
         {
@@ -18,12 +18,14 @@ public virtual IEnumerable<ProviderDefinition> DefaultDefinitions
         {
             get
             {
+                var config = (IProviderConfig)new TSettings();
+
                 yield return new IndexerDefinition
                 {
-                    Name = this.GetType().Name,
-                    Enable = false,
+                    Name = GetType().Name,
+                    Enable = config.Validate().IsValid,
                     Implementation = GetType().Name,
-                    Settings = NullConfig.Instance
+                    Settings = config
                 };
             }
         }
diff --git a/NzbDrone.Integration.Test/IndexerIntegrationFixture.cs b/NzbDrone.Integration.Test/IndexerIntegrationFixture.cs
index 33fb6e0ab0..96003762b1 100644
--- a/NzbDrone.Integration.Test/IndexerIntegrationFixture.cs
+++ b/NzbDrone.Integration.Test/IndexerIntegrationFixture.cs
@@ -1,5 +1,7 @@
-using FluentAssertions;
+using System.Linq;
+using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Integration.Test
 {
@@ -13,6 +15,7 @@ public void should_have_built_in_indexer()
 
             indexers.Should().NotBeEmpty();
             indexers.Should().NotContain(c => string.IsNullOrWhiteSpace(c.Name));
+            indexers.Where(c => c.ConfigContract == typeof(NullConfig).Name).Should().OnlyContain(c => c.Enable);
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Integration.Test/ReleaseIntegrationTest.cs b/NzbDrone.Integration.Test/ReleaseIntegrationTest.cs
index b9a86674ea..eb76f12557 100644
--- a/NzbDrone.Integration.Test/ReleaseIntegrationTest.cs
+++ b/NzbDrone.Integration.Test/ReleaseIntegrationTest.cs
@@ -1,4 +1,5 @@
-using FluentAssertions;
+using System.Threading;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Api.Indexers;
 
@@ -10,10 +11,13 @@ public class ReleaseIntegrationTest : IntegrationTest
         [Test]
         public void should_only_have_unknown_series_releases()
         {
+
             var releases = Releases.All();
+            var indexers = Indexers.All();
+
 
             releases.Should().OnlyContain(c => c.Rejections.Contains("Unknown Series"));
-            releases.Should().OnlyContain(c=>BeValidRelease(c));
+            releases.Should().OnlyContain(c => BeValidRelease(c));
         }