diff --git a/libraries/src/Router/SiteRouter.php b/libraries/src/Router/SiteRouter.php
index d88ece30e91cf..030cf695fbd73 100644
--- a/libraries/src/Router/SiteRouter.php
+++ b/libraries/src/Router/SiteRouter.php
@@ -481,10 +481,11 @@ public function buildPaginationData(&$router, &$uri)
     {
         $limitstart = $uri->getVar('limitstart');
 
-        if ($limitstart !== null) {
-            $uri->setVar('start', (int) $uri->getVar('limitstart'));
-            $uri->delVar('limitstart');
+        if ($limitstart !== null && $limitstart !== '') {
+            $uri->setVar('start', (int) $limitstart);
         }
+
+        $uri->delVar('limitstart');
     }
 
     /**