diff --git a/frontend/app/components/Assist/RecordingsList/RecordingsList.tsx b/frontend/app/components/Assist/RecordingsList/RecordingsList.tsx
index bb8c18d64..f0b78fb71 100644
--- a/frontend/app/components/Assist/RecordingsList/RecordingsList.tsx
+++ b/frontend/app/components/Assist/RecordingsList/RecordingsList.tsx
@@ -63,7 +63,7 @@ function RecordingsList() {
         </div>
         <Pagination
           page={page}
-          totalPages={Math.ceil(total / pageSize)}
+          total={total}
           onPageChange={(page) => recordingsStore.updatePage(page)}
           limit={pageSize}
           debounceRequest={100}
diff --git a/frontend/app/components/AssistStats/components/Table.tsx b/frontend/app/components/AssistStats/components/Table.tsx
index f5b1c5a83..3a61cbdfc 100644
--- a/frontend/app/components/AssistStats/components/Table.tsx
+++ b/frontend/app/components/AssistStats/components/Table.tsx
@@ -113,7 +113,7 @@ function StatsTable({ onSort, isLoading, onPageChange, page, sessions, exportCSV
         )}
         <Pagination
           page={sessions.total > 0 ? page : 0}
-          totalPages={Math.ceil(sessions.total / PER_PAGE)}
+          total={sessions.total}
           onPageChange={onPageChange}
           limit={10}
           debounceRequest={200}
diff --git a/frontend/app/components/Client/Audit/AuditList/AuditList.tsx b/frontend/app/components/Client/Audit/AuditList/AuditList.tsx
index 6563ef164..53629c6d2 100644
--- a/frontend/app/components/Client/Audit/AuditList/AuditList.tsx
+++ b/frontend/app/components/Client/Audit/AuditList/AuditList.tsx
@@ -61,7 +61,7 @@ function AuditList(props: Props) {
                 <div className="w-full flex items-center justify-center py-10">
                     <Pagination
                         page={auditStore.page}
-                        totalPages={Math.ceil(auditStore.total / auditStore.pageSize)}
+                        total={auditStore.total}
                         onPageChange={(page) => auditStore.updateKey('page', page)}
                         limit={auditStore.pageSize}
                         debounceRequest={200}
diff --git a/frontend/app/components/Client/Sites/Sites.tsx b/frontend/app/components/Client/Sites/Sites.tsx
index 7794dafea..c59fa2405 100644
--- a/frontend/app/components/Client/Sites/Sites.tsx
+++ b/frontend/app/components/Client/Sites/Sites.tsx
@@ -160,7 +160,7 @@ const Sites = ({ loading, sites, user, init }: PropsFromRedux) => {
             <div className="w-full flex items-center justify-center py-10">
               <Pagination
                 page={page}
-                totalPages={Math.ceil(filteredSites.size / pageSize)}
+                total={filteredSites.size}
                 onPageChange={(page) => updatePage(page)}
                 limit={pageSize}
               />
diff --git a/frontend/app/components/Client/Users/components/UserList/UserList.tsx b/frontend/app/components/Client/Users/components/UserList/UserList.tsx
index c62f41101..7a09dce3f 100644
--- a/frontend/app/components/Client/Users/components/UserList/UserList.tsx
+++ b/frontend/app/components/Client/Users/components/UserList/UserList.tsx
@@ -86,7 +86,7 @@ function UserList(props: Props) {
                 <div className="w-full flex items-center justify-center py-10">
                     <Pagination
                         page={userStore.page}
-                        totalPages={Math.ceil(length / userStore.pageSize)}
+                        total={length}
                         onPageChange={(page) => userStore.updateKey('page', page)}
                         limit={userStore.pageSize}
                         debounceRequest={100}
diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx
index 94a3e5c4f..0a05af579 100644
--- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx
+++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx
@@ -65,9 +65,7 @@ function CustomMetricTableErrors(props: RouteComponentProps & Props) {
                     <div className="my-6 flex items-center justify-center">
                         <Pagination
                             page={metric.page}
-                            totalPages={Math.ceil(
-                                data.total / metric.limit
-                            )}
+                            total={data.total}
                             onPageChange={(page: any) =>
                                 metric.updateKey("page", page)
                             }
diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableSessions/CustomMetricTableSessions.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableSessions/CustomMetricTableSessions.tsx
index 05d6b538c..5622b8139 100644
--- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableSessions/CustomMetricTableSessions.tsx
+++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableSessions/CustomMetricTableSessions.tsx
@@ -46,7 +46,7 @@ function CustomMetricTableSessions(props: Props) {
           <div className="mt-6 flex items-center justify-center">
             <Pagination
               page={metric.page}
-              totalPages={Math.ceil(data.total / metric.limit)}
+              total={data.total}
               onPageChange={(page: any) => metric.updateKey('page', page)}
               limit={data.total}
               debounceRequest={500}
diff --git a/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx b/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx
index 75a474d01..dda4c4fbe 100644
--- a/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx
+++ b/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx
@@ -65,7 +65,7 @@ function AlertsList({ siteId }: Props) {
           </div>
           <Pagination
             page={page}
-            totalPages={Math.ceil(list.length / pageSize)}
+            total={list.length}
             onPageChange={(page) => alertsStore.updateKey('page', page)}
             limit={pageSize}
             debounceRequest={100}
diff --git a/frontend/app/components/Dashboard/components/CardIssues/CardIssues.tsx b/frontend/app/components/Dashboard/components/CardIssues/CardIssues.tsx
index 502498655..d5f68ef68 100644
--- a/frontend/app/components/Dashboard/components/CardIssues/CardIssues.tsx
+++ b/frontend/app/components/Dashboard/components/CardIssues/CardIssues.tsx
@@ -122,7 +122,7 @@ function CardIssues() {
 
         <Pagination
           page={filter.page}
-          totalPages={Math.ceil(data.total / pageSize)}
+          total={data.total}
           onPageChange={(page: any) => filter.updateKey('page', page)}
           limit={pageSize}
           debounceRequest={500}
diff --git a/frontend/app/components/Dashboard/components/CardUserList/CardUserList.tsx b/frontend/app/components/Dashboard/components/CardUserList/CardUserList.tsx
index 60814047b..3cbc720b6 100644
--- a/frontend/app/components/Dashboard/components/CardUserList/CardUserList.tsx
+++ b/frontend/app/components/Dashboard/components/CardUserList/CardUserList.tsx
@@ -64,7 +64,7 @@ function CardUserList(props: RouteComponentProps<Props>) {
                 </div>
                 <Pagination
                     page={metricStore.sessionsPage}
-                    totalPages={Math.ceil(data.length / metricStore.sessionsPageSize)}
+                    total={data.length}
                     onPageChange={(page: any) => metricStore.updateKey('sessionsPage', page)}
                     limit={metricStore.sessionsPageSize}
                     debounceRequest={500}
diff --git a/frontend/app/components/Dashboard/components/CardUserList/SessionsModal/SessionsModal.tsx b/frontend/app/components/Dashboard/components/CardUserList/SessionsModal/SessionsModal.tsx
index 6e4381e3f..72c8b7194 100644
--- a/frontend/app/components/Dashboard/components/CardUserList/SessionsModal/SessionsModal.tsx
+++ b/frontend/app/components/Dashboard/components/CardUserList/SessionsModal/SessionsModal.tsx
@@ -84,7 +84,7 @@ function SessionsModal(props: Props) {
                         </div>
                         <Pagination
                             page={filter.page}
-                            totalPages={Math.ceil(data.total / PER_PAGE)}
+                            total={data.total}
                             onPageChange={(page) => filter.update('page', page)}
                             limit={PER_PAGE}
                             debounceRequest={1000}
diff --git a/frontend/app/components/Dashboard/components/DashboardList/DashboardList.tsx b/frontend/app/components/Dashboard/components/DashboardList/DashboardList.tsx
index efd9a51d8..beecb7c63 100644
--- a/frontend/app/components/Dashboard/components/DashboardList/DashboardList.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardList/DashboardList.tsx
@@ -54,7 +54,7 @@ function DashboardList() {
         </div>
         <Pagination
           page={dashboardStore.page}
-          totalPages={Math.ceil(lenth / dashboardStore.pageSize)}
+          total={lenth}
           onPageChange={(page) => dashboardStore.updateKey('page', page)}
           limit={dashboardStore.pageSize}
           debounceRequest={100}
diff --git a/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx b/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
index a55a62618..42a75a6be 100644
--- a/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
@@ -93,7 +93,7 @@ function MetricsList({
           </div>
           <Pagination
             page={metricStore.page}
-            totalPages={Math.ceil(lenth / metricStore.pageSize)}
+            total={lenth}
             onPageChange={(page) => metricStore.updateKey('page', page)}
             limit={metricStore.pageSize}
             debounceRequest={100}
diff --git a/frontend/app/components/Dashboard/components/SessionsModal/SessionsModal.tsx b/frontend/app/components/Dashboard/components/SessionsModal/SessionsModal.tsx
index 8465a03f3..7edb5fa97 100644
--- a/frontend/app/components/Dashboard/components/SessionsModal/SessionsModal.tsx
+++ b/frontend/app/components/Dashboard/components/SessionsModal/SessionsModal.tsx
@@ -69,7 +69,7 @@ function SessionsModal(props: Props) {
         </div>
         <Pagination
           page={page}
-          totalPages={Math.ceil(total / 10)}
+          total={total}
           onPageChange={(page: any) => setPage(page)}
           limit={10}
           debounceRequest={500}
diff --git a/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx b/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx
index 43ae35420..f08cfff7c 100644
--- a/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx
@@ -174,7 +174,7 @@ function WidgetSessions(props: Props) {
               </div>
               <Pagination
                 page={metricStore.sessionsPage}
-                totalPages={Math.ceil(filteredSessions.total / metricStore.sessionsPageSize)}
+                total={filteredSessions.total}
                 onPageChange={(page: any) => metricStore.updateKey('sessionsPage', page)}
                 limit={metricStore.sessionsPageSize}
                 debounceRequest={500}
diff --git a/frontend/app/components/Errors/List/List.js b/frontend/app/components/Errors/List/List.js
index d41ebd50c..a51a3c2b0 100644
--- a/frontend/app/components/Errors/List/List.js
+++ b/frontend/app/components/Errors/List/List.js
@@ -245,7 +245,7 @@ export default class List extends React.PureComponent {
 						<div className="w-full flex items-center justify-center mt-4">
 							<Pagination
 								page={currentPage}
-								totalPages={Math.ceil(total / limit)}
+								total={total}
 								onPageChange={(page) => this.props.updateCurrentPage(page)}
 								limit={limit}
 								debounceRequest={500}
diff --git a/frontend/app/components/FFlags/FFlagsList.tsx b/frontend/app/components/FFlags/FFlagsList.tsx
index 3b1c9de07..485d919e9 100644
--- a/frontend/app/components/FFlags/FFlagsList.tsx
+++ b/frontend/app/components/FFlags/FFlagsList.tsx
@@ -108,7 +108,7 @@ function FFlagsList({ siteId }: { siteId: string }) {
               </div>
               <Pagination
                 page={featureFlagsStore.page}
-                totalPages={Math.ceil(featureFlagsStore.total / featureFlagsStore.pageSize)}
+                total={featureFlagsStore.total}
                 onPageChange={(page) => featureFlagsStore.setPage(page)}
                 limit={featureFlagsStore.pageSize}
                 debounceRequest={100}
diff --git a/frontend/app/components/Funnels/FunnelList/FunnelList.tsx b/frontend/app/components/Funnels/FunnelList/FunnelList.tsx
index ca18a3c81..627cbcc05 100644
--- a/frontend/app/components/Funnels/FunnelList/FunnelList.tsx
+++ b/frontend/app/components/Funnels/FunnelList/FunnelList.tsx
@@ -48,7 +48,7 @@ function FunnelList(props) {
             <div className="w-full flex items-center justify-center py-8">
                 <Pagination
                     page={funnelStore.page}
-                    totalPages={Math.ceil(list.length / funnelStore.pageSize)}
+                    total={list.length}
                     onPageChange={(page) => funnelStore.updateKey('page', page)}
                     limit={funnelStore.pageSize}
                     debounceRequest={100}
diff --git a/frontend/app/components/Session_/Player/Controls/AssistSessionsModal/AssistSessionsModal.tsx b/frontend/app/components/Session_/Player/Controls/AssistSessionsModal/AssistSessionsModal.tsx
index ce6770756..6fd6043fc 100644
--- a/frontend/app/components/Session_/Player/Controls/AssistSessionsModal/AssistSessionsModal.tsx
+++ b/frontend/app/components/Session_/Player/Controls/AssistSessionsModal/AssistSessionsModal.tsx
@@ -147,7 +147,7 @@ function AssistSessionsModal(props: Props) {
         <div className="w-full flex items-center justify-center py-6">
           <Pagination
             page={currentPage}
-            totalPages={Math.ceil(total / PER_PAGE)}
+            total={total}
             onPageChange={(page: any) => props.updateCurrentPage(page)}
             limit={PER_PAGE}
           />
diff --git a/frontend/app/components/UsabilityTesting/LiveTestsModal.tsx b/frontend/app/components/UsabilityTesting/LiveTestsModal.tsx
index 5f15bac3c..dd37d5ff3 100644
--- a/frontend/app/components/UsabilityTesting/LiveTestsModal.tsx
+++ b/frontend/app/components/UsabilityTesting/LiveTestsModal.tsx
@@ -56,7 +56,7 @@ function LiveTestsModal({ testId, closeModal }: { testId: string; closeModal: ()
           </div>
           <Pagination
             page={page}
-            totalPages={Math.ceil(uxtestingStore.testAssistSessions.total / 10)}
+            total={uxtestingStore.testAssistSessions.total}
             onPageChange={refreshData}
             limit={10}
             debounceRequest={200}
diff --git a/frontend/app/components/UsabilityTesting/ResponsesOverview.tsx b/frontend/app/components/UsabilityTesting/ResponsesOverview.tsx
index 07e780e4c..1644447b0 100644
--- a/frontend/app/components/UsabilityTesting/ResponsesOverview.tsx
+++ b/frontend/app/components/UsabilityTesting/ResponsesOverview.tsx
@@ -144,7 +144,7 @@ const ResponsesOverview = observer(() => {
             </div>
             <Pagination
               page={page}
-              totalPages={Math.ceil(uxtestingStore.responses[taskId!]?.total / 10)}
+              total={uxtestingStore.responses[taskId!]?.total ?? 0}
               onPageChange={(p) => setPage(p)}
             />
           </div>
diff --git a/frontend/app/components/UsabilityTesting/TestOverview.tsx b/frontend/app/components/UsabilityTesting/TestOverview.tsx
index 3ef7b3948..4567e157b 100644
--- a/frontend/app/components/UsabilityTesting/TestOverview.tsx
+++ b/frontend/app/components/UsabilityTesting/TestOverview.tsx
@@ -213,7 +213,7 @@ function TestOverview() {
                 </div>
                 <Pagination
                   page={uxtestingStore.testSessions.page}
-                  totalPages={Math.ceil(uxtestingStore.testSessions.total / 10)}
+                  total={uxtestingStore.testSessions.total}
                   onPageChange={onPageChange}
                   limit={10}
                   debounceRequest={200}
diff --git a/frontend/app/components/UsabilityTesting/UsabilityTesting.tsx b/frontend/app/components/UsabilityTesting/UsabilityTesting.tsx
index 83b9e19e3..177adfc4f 100644
--- a/frontend/app/components/UsabilityTesting/UsabilityTesting.tsx
+++ b/frontend/app/components/UsabilityTesting/UsabilityTesting.tsx
@@ -171,7 +171,7 @@ function TestsTable() {
               </div>
               <Pagination
                 page={uxtestingStore.page}
-                totalPages={Math.ceil(uxtestingStore.total / 10)}
+                total={uxtestingStore.total}
                 onPageChange={onPageChange}
                 limit={10}
                 debounceRequest={200}
diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index 4b4730cf0..107067b24 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -172,7 +172,7 @@ function LiveSessionList(props: Props) {
               </div>
               <Pagination
                 page={currentPage}
-                totalPages={Math.ceil(total / PER_PAGE)}
+                total={total}
                 onPageChange={(page: any) => props.updateCurrentPage(page)}
                 limit={PER_PAGE}
                 debounceRequest={500}
diff --git a/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx b/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx
index 75f523e3f..db6b57ccc 100644
--- a/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx
+++ b/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx
@@ -48,7 +48,7 @@ function NotesList({ members }: { members: Array<Record<string, any>> }) {
           </div>
           <Pagination
             page={notesStore.page}
-            totalPages={Math.ceil(list.length / notesStore.pageSize)}
+            total={list.length}
             onPageChange={(page) => notesStore.changePage(page)}
             limit={notesStore.pageSize}
             debounceRequest={100}
diff --git a/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx b/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx
index 5d094f8da..08549dba9 100644
--- a/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx
+++ b/frontend/app/components/shared/SessionsTabOverview/components/SessionList/SessionList.tsx
@@ -266,7 +266,7 @@ function SessionList(props: Props) {
               </div>
               <Pagination
                 page={currentPage}
-                totalPages={Math.ceil(total / pageSize)}
+                total={total}
                 onPageChange={(page) => props.updateCurrentPage(page)}
                 limit={pageSize}
                 debounceRequest={1000}
diff --git a/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx b/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx
index 1b709a6a6..a878166a8 100644
--- a/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx
+++ b/frontend/app/components/shared/UserSessionsModal/UserSessionsModal.tsx
@@ -84,7 +84,7 @@ function UserSessionsModal(props: Props) {
                         </div>
                         <Pagination
                             page={filter.page}
-                            totalPages={Math.ceil(data.total / PER_PAGE)}
+                            total={data.total}
                             onPageChange={(page) => filter.update('page', page)}
                             limit={PER_PAGE}
                             debounceRequest={1000}
diff --git a/frontend/app/components/ui/Pagination/Pagination.tsx b/frontend/app/components/ui/Pagination/Pagination.tsx
index 4d5a17943..7d71f5c31 100644
--- a/frontend/app/components/ui/Pagination/Pagination.tsx
+++ b/frontend/app/components/ui/Pagination/Pagination.tsx
@@ -4,20 +4,20 @@ import { debounce } from 'App/utils';
 
 interface Props {
   page: number;
-  totalPages: number;
+  total: number;
   onPageChange: (page: number) => void;
   limit?: number;
   debounceRequest?: number;
 }
 export default function Pagination(props: Props) {
-  const { page, totalPages, onPageChange, limit = 5, debounceRequest = 0 } = props;
+  const { page, total, onPageChange, limit = 5, debounceRequest = 0 } = props;
   const [currentPage, setCurrentPage] = React.useState(page);
   React.useMemo(() => setCurrentPage(page), [page]);
 
   const debounceChange = React.useCallback(debounce(onPageChange, debounceRequest), []);
 
   const changePage = (page: number) => {
-    if (page > 0 && page <= totalPages) {
+    if (page > 0) {
       setCurrentPage(page);
       debounceChange(page);
     }
@@ -28,7 +28,7 @@ export default function Pagination(props: Props) {
       <AntPagination
         simple
         current={currentPage}
-        total={totalPages}
+        total={total}
         pageSize={limit}
         onChange={changePage}
         showSizeChanger={false}