diff --git a/frontend/libs/console/legacy-ce/src/lib/new-components/PaginationWithOnlyNav/PaginationWithOnlyNav.tsx b/frontend/libs/console/legacy-ce/src/lib/new-components/PaginationWithOnlyNav/PaginationWithOnlyNav.tsx
index 97ebf456c6e..89bb2becd5b 100644
--- a/frontend/libs/console/legacy-ce/src/lib/new-components/PaginationWithOnlyNav/PaginationWithOnlyNav.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/new-components/PaginationWithOnlyNav/PaginationWithOnlyNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button } from '../Button';
 import { inputStyles } from '../../components/Services/Events/constants';
 
@@ -13,6 +12,7 @@ export type PaginationWithOnlyNavProps = {
 export const PaginationWithOnlyNav = (props: PaginationWithOnlyNavProps) => {
   const { offset, limit, changePage, changePageSize, rows } = props;
   const newPage = offset / limit;
+  const isNextEnabled = rows.length === limit;
   return (
     <div className="flex ml-sm mr-sm mb-sm mt-sm justify-around max-w-5xl">
       <div>
@@ -48,7 +48,7 @@ export const PaginationWithOnlyNav = (props: PaginationWithOnlyNavProps) => {
       <div>
         <Button
           onClick={() => changePage(newPage + 1)}
-          disabled={rows.length === 0}
+          disabled={rows.length === 0 || !isNextEnabled}
           data-test="custom-pagination-next"
         >
           Next