diff --git a/packages/ui/package.json b/packages/ui/package.json
index 4ddfacfa0..7526ecda4 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ferlab/ui",
-    "version": "5.5.7",
+    "version": "5.5.8",
     "description": "Core components for scientific research data portals",
     "publishConfig": {
         "access": "public"
diff --git a/packages/ui/src/components/ProTable/Pagination/index.tsx b/packages/ui/src/components/ProTable/Pagination/index.tsx
index 2c306e2a8..c358baf1d 100644
--- a/packages/ui/src/components/ProTable/Pagination/index.tsx
+++ b/packages/ui/src/components/ProTable/Pagination/index.tsx
@@ -94,7 +94,7 @@ const Pagination = ({
                 {dictionary?.pagination?.previous || 'Prev.'}
             </Button>
             <Button
-                disabled={total === 0 || total < queryConfig.size || loading}
+                disabled={total === 0 || total < queryConfig.size || queryConfig.size * current >= total || loading}
                 onClick={() => {
                     setQueryConfig({
                         ...queryConfig,