diff --git a/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx b/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx
index 2d4a451306c..72ae92157c9 100644
--- a/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx
+++ b/smart-frontend/app/src/components/pages/ActionsPage/ActionsToolbar/ActionsToolbar.tsx
@@ -27,7 +27,8 @@ import FrequencySelect from '@uikit/Table/FrequencySelect/FrequencySelect';
 
 const ActionsToolbar: React.FC = () => {
   const dispatch = useDispatch();
-  const actions = useStore(({ adh }) => adh.actions.actions);
+
+  const totalCount = useStore(({ adh }) => adh.actions.totalCount);
   const paginationParams = useStore(({ adh }) => adh.actionsTable.paginationParams);
   const requestFrequency = useStore(({ adh }) => adh.actionsTable.requestFrequency);
 
@@ -43,8 +44,8 @@ const ActionsToolbar: React.FC = () => {
     <FlexGroup gap="20px" className={s.actionsToolbar}>
       <ActionsResetFilter />
       <Pagination
-        isNextBtn={actions.length === paginationParams.perPage}
         pageData={paginationParams}
+        totalItems={totalCount}
         onChangeData={handlePaginationChange}
         frequencyComponent={<FrequencySelect value={requestFrequency} onChange={handleFrequencyChange} />}
       />
diff --git a/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx b/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx
index bda7c7cb3a4..40b10d39441 100644
--- a/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx
+++ b/smart-frontend/app/src/components/pages/AuditPage/AuditEventsToolbar/AuditEventsToolbar.tsx
@@ -27,7 +27,8 @@ import FrequencySelect from '@uikit/Table/FrequencySelect/FrequencySelect';
 
 const AuditEventsToolbar: React.FC = () => {
   const dispatch = useDispatch();
-  const auditEvents = useStore(({ adh }) => adh.auditEvents.auditEvents);
+
+  const totalCount = useStore(({ adh }) => adh.auditEvents.totalCount);
   const paginationParams = useStore(({ adh }) => adh.auditEventsTable.paginationParams);
   const requestFrequency = useStore(({ adh }) => adh.auditEventsTable.requestFrequency);
 
@@ -43,8 +44,8 @@ const AuditEventsToolbar: React.FC = () => {
     <FlexGroup gap="20px" className={s.auditEventsToolbar}>
       <AuditEventsResetFilter />
       <Pagination
-        isNextBtn={auditEvents.length === paginationParams.perPage}
         pageData={paginationParams}
+        totalItems={totalCount}
         onChangeData={handlePaginationChange}
         frequencyComponent={<FrequencySelect value={requestFrequency} onChange={handleFrequencyChange} />}
       />
diff --git a/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx b/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx
index 9b6d864ea41..6659fe13896 100644
--- a/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx
+++ b/smart-frontend/app/src/components/uikit/Pagination/Pagination.tsx
@@ -110,30 +110,30 @@ const Pagination = ({
         <RenderNumberButtons setPageNumber={setPageNumber} items={pageItems} currentPageNumber={pageNumber} />
         {totalPages === 0 && (
           <PaginationStepButton
-            arrowVariant={'arrowDouble'}
-            variant={'prev'}
+            arrowVariant="arrowDouble"
+            variant="prev"
             onClick={() => setPageNumber(0)}
             disabled={!hasPrev}
           />
         )}
         <PaginationStepButton
-          arrowVariant={'arrowSingle'}
+          arrowVariant="arrowSingle"
           onClick={() => setPageNumber(pageNumber - 1)}
           disabled={!hasPrev}
           dataTest="pagination-prev-page"
         />
         <PaginationStepButton
-          arrowVariant={'arrowSingle'}
+          arrowVariant="arrowSingle"
           onClick={() => setPageNumber(pageNumber + 1)}
-          variant={'next'}
+          variant="next"
           disabled={!hasNext}
           dataTest="pagination-next-page"
         />
         {totalItems !== 0 && (
           <PaginationStepButton
-            arrowVariant={'arrowDouble'}
+            arrowVariant="arrowDouble"
             onClick={() => setPageNumber(totalItems)}
-            variant={'next'}
+            variant="next"
             disabled={!hasNext}
             dataTest="pagination-last-page"
           />