diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
index 87c3a692e..99e0bdedd 100644
--- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
+++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
@@ -176,12 +176,16 @@ protected virtual async Task<IndexerPageableQueryResult> FetchReleases(Func<IInd
                     {
                         var pagedReleases = new List<ReleaseInfo>();
 
+                        var pageSize = PageSize;
+
                         foreach (var request in pageableRequest)
                         {
                             url = request.Url.FullUri;
 
                             var page = await FetchPage(request, parser);
 
+                            pageSize = pageSize == 1 ? page.Releases.Count : pageSize;
+
                             result.Queries.Add(page);
 
                             pagedReleases.AddRange(page.Releases);
@@ -213,7 +217,7 @@ protected virtual async Task<IndexerPageableQueryResult> FetchReleases(Func<IInd
                                 break;
                             }
 
-                            if (!IsFullPage(page.Releases))
+                            if (!IsFullPage(page.Releases, pageSize))
                             {
                                 break;
                             }
@@ -336,9 +340,9 @@ public override IndexerCapabilities GetCapabilities()
             return Capabilities ?? ((IndexerDefinition)Definition).Capabilities;
         }
 
-        protected virtual bool IsFullPage(IList<ReleaseInfo> page)
+        protected virtual bool IsFullPage(IList<ReleaseInfo> page, int pageSize)
         {
-            return PageSize != 0 && page.Count >= PageSize;
+            return pageSize != 0 && page.Count >= pageSize;
         }
 
         protected virtual async Task<IndexerQueryResult> FetchPage(IndexerRequest request, IParseIndexerResponse parser)