diff --git a/web/src/lib/components/timeline/AssetLayout.svelte b/web/src/lib/components/timeline/AssetLayout.svelte
index 4ecf71f517..c6ee04a21f 100644
--- a/web/src/lib/components/timeline/AssetLayout.svelte
+++ b/web/src/lib/components/timeline/AssetLayout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
-  import { filterIsInOrNearViewport } from '$lib/managers/timeline-manager/utils.svelte';
   import type { ViewerAsset } from '$lib/managers/timeline-manager/viewer-asset.svelte';
   import type { VirtualScrollManager } from '$lib/managers/VirtualScrollManager/VirtualScrollManager.svelte';
   import { uploadAssetsStore } from '$lib/stores/upload';
@@ -13,6 +12,8 @@
 
   type Props = {
     viewerAssets: ViewerAsset[];
+    firstInOrNearIndex: number;
+    lastInOrNearIndex: number;
     width: number;
     height: number;
     manager: VirtualScrollManager;
@@ -27,15 +28,27 @@
     customThumbnailLayout?: Snippet<[asset: TimelineAsset]>;
   };
 
-  const { viewerAssets, width, height, manager, thumbnail, customThumbnailLayout }: Props = $props();
+  const {
+    viewerAssets,
+    firstInOrNearIndex,
+    lastInOrNearIndex,
+    width,
+    height,
+    manager,
+    thumbnail,
+    customThumbnailLayout,
+  }: Props = $props();
 
   const transitionDuration = $derived(manager.suspendTransitions && !$isUploading ? 0 : 150);
   const scaleDuration = $derived(transitionDuration === 0 ? 0 : transitionDuration + 100);
+  const visibleViewerAssets = $derived(
+    firstInOrNearIndex === -1 ? [] : viewerAssets.slice(firstInOrNearIndex, lastInOrNearIndex + 1),
+  );
 </script>
 
 <!-- Image grid -->
 <div data-image-grid class="relative overflow-clip" style:height={height + 'px'} style:width={width + 'px'}>
-  {#each filterIsInOrNearViewport(viewerAssets) as viewerAsset (viewerAsset.id)}
+  {#each visibleViewerAssets as viewerAsset (viewerAsset.id)}
     {@const position = viewerAsset.position!}
     {@const asset = viewerAsset.asset!}
 
diff --git a/web/src/lib/components/timeline/Month.svelte b/web/src/lib/components/timeline/Month.svelte
index 3f4b9b0661..ccd1d025d9 100644
--- a/web/src/lib/components/timeline/Month.svelte
+++ b/web/src/lib/components/timeline/Month.svelte
@@ -101,6 +101,8 @@
     <AssetLayout
       {manager}
       viewerAssets={timelineDay.viewerAssets}
+      firstInOrNearIndex={timelineDay.firstInOrNearIndex}
+      lastInOrNearIndex={timelineDay.lastInOrNearIndex}
       height={timelineDay.height}
       width={timelineDay.width}
       {customThumbnailLayout}
diff --git a/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts
index 6307b44f52..e5505f2030 100644
--- a/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts
@@ -22,12 +22,12 @@ export class TimelineDay {
 
   height = $state(0);
   width = $state(0);
-  isInOrNearViewport = $derived.by(() => this.viewerAssets.some((viewAsset) => viewAsset.isInOrNearViewport));
 
   // Indices into viewerAssets bounding the in-or-near range. -1/-1 means no assets are in-or-near.
   // Updated imperatively by updateAssetBoundaries() from updateViewportProximities() and layout().
   firstInOrNearIndex = $state(-1);
   lastInOrNearIndex = $state(-1);
+  isInOrNearViewport = $derived(this.firstInOrNearIndex !== -1);
 
   #top: number = $state(0);
   #start: number = $state(0);