diff --git a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
index 5bc8afa21..360eccbbc 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/Calendar.tsx
@@ -63,7 +63,18 @@ export const Calendar = ({
       TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE,
     );
 
-  const { timelineCalendarEvents } = data?.[queryName] ?? {};
+  const { timelineCalendarEvents, totalNumberOfCalendarEvents } =
+    data?.[queryName] ?? {};
+  const hasMoreCalendarEvents =
+    timelineCalendarEvents && totalNumberOfCalendarEvents
+      ? timelineCalendarEvents?.length < totalNumberOfCalendarEvents
+      : false;
+
+  const handleLastRowVisible = async () => {
+    if (hasMoreCalendarEvents) {
+      await fetchMoreRecords();
+    }
+  };
 
   const {
     calendarEventsByDayTime,
@@ -134,7 +145,7 @@ export const Calendar = ({
         })}
         <CustomResolverFetchMoreLoader
           loading={isFetchingMore || firstQueryLoading}
-          onLastRowVisible={fetchMoreRecords}
+          onLastRowVisible={handleLastRowVisible}
         />
       </StyledContainer>
     </CalendarContext.Provider>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
index 53038755d..17f44524f 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreads.tsx
@@ -60,6 +60,16 @@ export const EmailThreads = ({
     );
 
   const { totalNumberOfThreads, timelineThreads } = data?.[queryName] ?? {};
+  const hasMoreTimelineThreads =
+    timelineThreads && totalNumberOfThreads
+      ? timelineThreads?.length < totalNumberOfThreads
+      : false;
+
+  const handleLastRowVisible = async () => {
+    if (hasMoreTimelineThreads) {
+      await fetchMoreRecords();
+    }
+  };
 
   if (firstQueryLoading) {
     return <SkeletonLoader />;
@@ -108,7 +118,7 @@ export const EmailThreads = ({
         )}
         <CustomResolverFetchMoreLoader
           loading={isFetchingMore || firstQueryLoading}
-          onLastRowVisible={fetchMoreRecords}
+          onLastRowVisible={handleLastRowVisible}
         />
       </Section>
     </StyledContainer>