fix issue

Author: engcom-Charlie

app/code/Magento/Theme/Block/Html/Pager.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Theme\Block\Html;
 
 /**
@@ -466,7 +467,30 @@ public function getPageUrl($page)
      */
     public function getLimitUrl($limit)
     {
-        return $this->getPagerUrl([$this->getLimitVarName() => $limit]);
+        return $this->getPagerUrl($this->getPageLimitParams($limit));
+    }
+
+    /**
+     * Return page limit params
+     *
+     * @param int $limit
+     * @return array
+     */
+    private function getPageLimitParams(int $limit): array
+    {
+        $data = [$this->getLimitVarName() => $limit];
+
+        $currentPage = $this->getCurrentPage();
+        if ($currentPage === 1) {
+            return $data;
+        }
+
+        $availableCount = (int) ceil($this->getTotalNum() / $limit);
+        if ($availableCount < $currentPage) {
+            $data = array_merge($data, [$this->getPageVarName() => $availableCount === 1 ? null : $availableCount]);
+        }
+
+        return $data;
     }
 
     /**

app/code/Magento/Theme/Test/Unit/Block/Html/PagerTest.php

@@ -89,6 +89,60 @@ public function testGetPages(): void
         $this->assertEquals($expectedPages, $this->pager->getPages());
     }
 
+    /**
+     * Test get limit url.
+     *
+     * @dataProvider limitUrlDataProvider
+     *
+     * @param int $page
+     * @param int $size
+     * @param int $limit
+     * @param array $expectedParams
+     * @return void
+     */
+    public function testGetLimitUrl(int $page, int $size, int $limit, array $expectedParams): void
+    {
+        $expectedArray = [
+            '_current' => true,
+            '_escape' => true,
+            '_use_rewrite' => true,
+            '_fragment' => null,
+            '_query' => $expectedParams,
+        ];
+
+        $collectionMock = $this->createMock(Collection::class);
+        $collectionMock->expects($this->once())
+            ->method('getCurPage')
+            ->willReturn($page);
+        $collectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn($size);
+        $this->setCollectionProperty($collectionMock);
+
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('*/*/*', $expectedArray);
+
+        $this->pager->getLimitUrl($limit);
+    }
+
+    /**
+     * DataProvider for testGetLimitUrl
+     *
+     * @return array
+     */
+    public function limitUrlDataProvider(): array
+    {
+        return [
+            [2, 21, 10, ['limit' => 10]],
+            [3, 21, 10, ['limit' => 10]],
+            [2, 21, 20, ['limit' => 20]],
+            [3, 21, 50, ['limit' => 50, 'p' => null]],
+            [2, 11, 20, ['limit' => 20, 'p' => null]],
+            [4, 40, 20, ['limit' => 20, 'p' => 2]],
+        ];
+    }
+
     /**
      * Set Collection
      *