diff --git a/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs
index c2169d9cb..a5d33a8ba 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs
@@ -120,12 +120,12 @@ private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCr
                 baseUrl += "&apikey=" + Settings.ApiKey;
             }
 
-            if (searchCriteria.Limit.HasValue)
+            if (searchCriteria.Limit.HasValue && searchCriteria.Limit.Value > 0)
             {
                 parameters.Add("limit", searchCriteria.Limit.ToString());
             }
 
-            if (searchCriteria.Offset.HasValue)
+            if (searchCriteria.Offset.HasValue && searchCriteria.Offset.Value > 0)
             {
                 parameters.Add("offset", searchCriteria.Offset.ToString());
             }
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs
index ad3f48b07..f4bc090a6 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs
@@ -263,12 +263,12 @@ private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCr
                 searchUrl += "&apikey=" + Settings.ApiKey;
             }
 
-            if (searchCriteria.Limit.HasValue)
+            if (searchCriteria.Limit.HasValue && searchCriteria.Limit.Value > 0)
             {
                 parameters.Set("limit", searchCriteria.Limit.ToString());
             }
 
-            if (searchCriteria.Offset.HasValue)
+            if (searchCriteria.Offset.HasValue && searchCriteria.Offset.Value > 0)
             {
                 parameters.Set("offset", searchCriteria.Offset.ToString());
             }
diff --git a/src/Prowlarr.Api.V1/Search/SearchResource.cs b/src/Prowlarr.Api.V1/Search/SearchResource.cs
index 67f7659d1..2c6531ade 100644
--- a/src/Prowlarr.Api.V1/Search/SearchResource.cs
+++ b/src/Prowlarr.Api.V1/Search/SearchResource.cs
@@ -14,7 +14,7 @@ public SearchResource()
         public string Type { get; set; }
         public List<int> IndexerIds { get; set; }
         public List<int> Categories { get; set; }
-        public int Limit { get; set; }
-        public int Offset { get; set; }
+        public int? Limit { get; set; }
+        public int? Offset { get; set; }
     }
 }