diff --git a/packages/nicolium/src/queries/timelines/use-timeline.ts b/packages/nicolium/src/queries/timelines/use-timeline.ts
index 5ee5aada7..7ad6bcbbb 100644
--- a/packages/nicolium/src/queries/timelines/use-timeline.ts
+++ b/packages/nicolium/src/queries/timelines/use-timeline.ts
@@ -8,6 +8,7 @@ import {
   useTimelinesActions,
   type TimelineEntry,
 } from '@/stores/timelines';
+import { compareId } from '@/utils/comparators';
 
 import type { PaginatedResponse, PaginationParams, Status, StreamingParams } from 'pl-api';
 
@@ -25,6 +26,9 @@ interface TimelineOptions {
 
 const POLLING_INTERVAL = 20_000;
 
+const sinceIdUnsupported = (statuses: Status[], sinceId: string) =>
+  statuses.length > 0 && statuses.some((status) => compareId(status.id, sinceId) <= 0);
+
 const useTimeline = (
   timelineId: string,
   fetcher: TimelineFetcher,
@@ -35,6 +39,7 @@ const useTimeline = (
   const restoringMaxId = options?.restoringMaxId;
 
   const timeline = useStoreTimeline(timelineId);
+  const pollingEnabled = useTimelinesStore((state) => state.pollingEnabled);
   const timelineActions = useTimelinesActions();
 
   const { connected: streamingConnected } = useTimelineStream(
@@ -56,7 +61,8 @@ const useTimeline = (
 
   // polling fallback when streaming is not connected
   useEffect(() => {
-    if (!polling || streamingConnected || timeline.isPending || !newestStatusId) return;
+    if (!polling || !pollingEnabled || streamingConnected || timeline.isPending || !newestStatusId)
+      return;
 
     const poll = async () => {
       const sinceId =
@@ -66,6 +72,11 @@ const useTimeline = (
 
       try {
         const response = await fetcherRef.current({ since_id: sinceId });
+        if (sinceIdUnsupported(response.items, sinceId)) {
+          timelineActions.disablePolling();
+          return;
+        }
+
         if (response.items.length === 0) return;
 
         importEntities({ statuses: response.items });
@@ -77,7 +88,7 @@ const useTimeline = (
 
     const interval = setInterval(poll, POLLING_INTERVAL);
     return () => clearInterval(interval);
-  }, [timelineId, polling, streamingConnected, timeline.isPending]);
+  }, [timelineId, polling, pollingEnabled, streamingConnected, timeline.isPending]);
 
   useEffect(() => {
     if (!timeline.isPending || timeline.isFetching) return;
diff --git a/packages/nicolium/src/stores/timelines.ts b/packages/nicolium/src/stores/timelines.ts
index 28c42e3e0..e00e8761f 100644
--- a/packages/nicolium/src/stores/timelines.ts
+++ b/packages/nicolium/src/stores/timelines.ts
@@ -51,6 +51,7 @@ interface TimelineData {
 
 interface State {
   timelines: Record<string, TimelineData>;
+  pollingEnabled: boolean;
   actions: {
     expandTimeline: (
       timelineId: string,
@@ -76,6 +77,7 @@ interface State {
     deletePendingStatus: (idempotencyKey: string) => void;
     filterTimelines: (accountId: string) => void;
     resetTimeline: (timelineId: string) => void;
+    disablePolling: () => void;
   };
 }
 
@@ -186,6 +188,7 @@ const getTimelinesForStatus = (
 const useTimelinesStore = create<State>()(
   mutative((set) => ({
     timelines: {} as Record<string, TimelineData>,
+    pollingEnabled: true,
     actions: {
       expandTimeline: (timelineId, statuses, hasMore, initialFetch = false, restoring = false) =>
         set((state) => {
@@ -418,6 +421,10 @@ const useTimelinesStore = create<State>()(
         set((state) => {
           state.timelines[timelineId] = createEmptyTimeline();
         }),
+      disablePolling: () =>
+        set((state) => {
+          state.pollingEnabled = false;
+        }),
     },
   })),
 );