diff --git a/src/NzbDrone.Core/Applications/Qui/Qui.cs b/src/NzbDrone.Core/Applications/Qui/Qui.cs
index 950356fbd..dcdc7f852 100644
--- a/src/NzbDrone.Core/Applications/Qui/Qui.cs
+++ b/src/NzbDrone.Core/Applications/Qui/Qui.cs
@@ -114,7 +114,9 @@ public override void UpdateIndexer(IndexerDefinition indexer, bool forceSync = f
 
             var quiIndexer = BuildQuiIndexer(indexer, indexerCapabilities, indexerMapping?.RemoteIndexerId ?? 0);
 
-            var remoteIndexer = _quiProxy.GetIndexer(indexerMapping?.RemoteIndexerId ?? 0, Settings);
+            var remoteIndexer = indexerMapping?.RemoteIndexerId > 0
+                ? _quiProxy.GetIndexer(indexerMapping.RemoteIndexerId, Settings)
+                : null;
 
             if (remoteIndexer != null)
             {
diff --git a/src/NzbDrone.Core/Applications/Qui/QuiIndexer.cs b/src/NzbDrone.Core/Applications/Qui/QuiIndexer.cs
index 9ace70b06..3834d5da4 100644
--- a/src/NzbDrone.Core/Applications/Qui/QuiIndexer.cs
+++ b/src/NzbDrone.Core/Applications/Qui/QuiIndexer.cs
@@ -71,13 +71,20 @@ public bool Equals(QuiIndexer other)
             var thisCategories = (Categories ?? Enumerable.Empty<QuiCategory>()).Select(c => c.CategoryId).OrderBy(c => c);
             var otherCategories = (other.Categories ?? Enumerable.Empty<QuiCategory>()).Select(c => c.CategoryId).OrderBy(c => c);
 
+            var thisCapabilities = (Capabilities ?? Enumerable.Empty<string>()).OrderBy(c => c);
+            var otherCapabilities = (other.Capabilities ?? Enumerable.Empty<string>()).OrderBy(c => c);
+
             return other.BaseUrl == BaseUrl &&
                 other.ApiKey == ApiKey &&
                 other.Name == Name &&
                 other.Backend == Backend &&
                 other.Enabled == Enabled &&
                 other.Priority == Priority &&
+                other.TimeoutSeconds == TimeoutSeconds &&
+                other.LimitDefault == LimitDefault &&
+                other.LimitMax == LimitMax &&
                 other.IndexerId == IndexerId &&
+                otherCapabilities.SequenceEqual(thisCapabilities) &&
                 otherCategories.SequenceEqual(thisCategories);
         }