diff --git a/src/NzbDrone.Core/Indexers/IndexerFactory.cs b/src/NzbDrone.Core/Indexers/IndexerFactory.cs
index 2066dd9d9..875ee4588 100644
--- a/src/NzbDrone.Core/Indexers/IndexerFactory.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerFactory.cs
@@ -79,8 +79,7 @@ namespace NzbDrone.Core.Indexers
             foreach (var provider in _providers)
             {
                 var definitions = provider.DefaultDefinitions
-                    .Where(v => v.Name != null && v.Name != provider.GetType().Name)
-                    .Take(10);
+                    .Where(v => v.Name != null && v.Name != provider.GetType().Name);
 
                 foreach (IndexerDefinition definition in definitions)
                 {
diff --git a/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs b/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs
index 6c1818845..fec61a0bf 100644
--- a/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs
+++ b/src/Prowlarr.Api.V1/Indexers/IndexerResource.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.Indexers;
@@ -36,7 +37,7 @@ namespace Prowlarr.Api.V1.Indexers
             {
                 Console.WriteLine("mapping cardigann def");
 
-                var extraFields = definition.ExtraFields.Select((x, i) => MapField(x, i)).ToList();
+                var extraFields = definition.ExtraFields?.Select((x, i) => MapField(x, i)).ToList() ?? new List<Field>();
 
                 resource.Fields.AddRange(extraFields);