diff --git a/src/routes/(app)/[username]/collection/characters/+page.svelte b/src/routes/(app)/[username]/collection/characters/+page.svelte
index 4c2eae32..1e7d7d27 100644
--- a/src/routes/(app)/[username]/collection/characters/+page.svelte
+++ b/src/routes/(app)/[username]/collection/characters/+page.svelte
@@ -90,7 +90,6 @@
 
 	const isLoading = $derived(collectionQuery.isLoading)
 	const isEmpty = $derived(!isLoading && allCharacters.length === 0)
-	const showSentinel = $derived(collectionQuery.hasNextPage && !collectionQuery.isFetchingNextPage)
 
 	// Current view mode from store
 	const currentViewMode = $derived(viewMode.collectionView)
@@ -185,9 +184,12 @@
 		{/if}
 
 		{#if !isLoading && !isEmpty}
-			{#if showSentinel}
-				<div class="load-more-sentinel" bind:this={sentinelEl}></div>
-			{/if}
+			<!-- Sentinel always in DOM to avoid Svelte block tracking issues during rapid updates -->
+			<div
+				class="load-more-sentinel"
+				bind:this={sentinelEl}
+				class:hidden={!collectionQuery.hasNextPage}
+			></div>
 
 			{#if collectionQuery.isFetchingNextPage}
 				<div class="loading-more">
@@ -195,7 +197,6 @@
 					<span>Loading more...</span>
 				</div>
 			{/if}
-
 		{/if}
 	</div>
 </div>
@@ -267,6 +268,10 @@
 	.load-more-sentinel {
 		height: 1px;
 		margin-top: $unit;
+
+		&.hidden {
+			display: none;
+		}
 	}
 
 	.loading-more {
diff --git a/src/routes/(app)/[username]/collection/weapons/+page.svelte b/src/routes/(app)/[username]/collection/weapons/+page.svelte
index 67667699..10c727be 100644
--- a/src/routes/(app)/[username]/collection/weapons/+page.svelte
+++ b/src/routes/(app)/[username]/collection/weapons/+page.svelte
@@ -88,7 +88,6 @@
 
 	const isLoading = $derived(collectionQuery.isLoading)
 	const isEmpty = $derived(!isLoading && allWeapons.length === 0)
-	const showSentinel = $derived(collectionQuery.hasNextPage && !collectionQuery.isFetchingNextPage)
 
 	// Current view mode from store
 	const currentViewMode = $derived(viewMode.collectionView)
@@ -173,9 +172,12 @@
 		{/if}
 
 		{#if !isLoading && !isEmpty}
-			{#if showSentinel}
-				<div class="load-more-sentinel" bind:this={sentinelEl}></div>
-			{/if}
+			<!-- Sentinel always in DOM to avoid Svelte block tracking issues during rapid updates -->
+			<div
+				class="load-more-sentinel"
+				bind:this={sentinelEl}
+				class:hidden={!collectionQuery.hasNextPage}
+			></div>
 
 			{#if collectionQuery.isFetchingNextPage}
 				<div class="loading-more">
@@ -183,7 +185,6 @@
 					<span>Loading more...</span>
 				</div>
 			{/if}
-
 		{/if}
 	</div>
 </div>
@@ -255,6 +256,10 @@
 	.load-more-sentinel {
 		height: 1px;
 		margin-top: $unit;
+
+		&.hidden {
+			display: none;
+		}
 	}
 
 	.loading-more {