diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx
index 43e50e03025..f3f1c20913f 100644
--- a/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx
+++ b/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx
@@ -16,6 +16,7 @@ const useStyles = makeStyles()((theme) => ({
         width: '100%',
         overflowY: 'scroll',
         position: 'relative',
+        overscrollBehavior: 'contain',
         gap: '10px',
         scrollbarWidth: 'none',
         '&::-webkit-scrollbar': {
diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx
index 62009066344..740477bcf98 100644
--- a/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx
+++ b/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx
@@ -16,6 +16,7 @@ const useStyles = makeStyles()((theme) => ({
         width: '100%',
         overflowY: 'scroll',
         position: 'relative',
+        overscrollBehavior: 'contain',
         gap: '10px',
         scrollbarWidth: 'none',
         '&::-webkit-scrollbar': {
diff --git a/packages/web3-providers/src/Calendar/index.ts b/packages/web3-providers/src/Calendar/index.ts
index 2a8e4ccd7f3..4323d36b8a6 100644
--- a/packages/web3-providers/src/Calendar/index.ts
+++ b/packages/web3-providers/src/Calendar/index.ts
@@ -77,7 +77,7 @@ export class Calendar {
         return createPageable(
             events,
             indicator,
-            createNextIndicator(indicator, next && next !== '0' ? next : undefined),
+            next && next !== '0' ? createNextIndicator(indicator, next) : undefined,
         )
     }
     static async getEventList(start_date: number, end_date: number, indicator?: PageIndicator) {
@@ -97,7 +97,7 @@ export class Calendar {
         return createPageable(
             events,
             indicator,
-            createNextIndicator(indicator, next && next !== '0' ? next : undefined),
+            next && next !== '0' ? createNextIndicator(indicator, next) : undefined,
         )
     }
     static async getAvailableDates(type: EventProvider, start_date: number, end_date: number) {