diff --git a/src/web/routes/dating/chat/[matchId]/+page.svelte b/src/web/routes/dating/chat/[matchId]/+page.svelte
index fb84e9a..3daa545 100644
--- a/src/web/routes/dating/chat/[matchId]/+page.svelte
+++ b/src/web/routes/dating/chat/[matchId]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { page } from '$app/state';
-	import { tick } from 'svelte';
+	import { tick, untrack } from 'svelte';
 	import { getNexoContext } from '../../_lib/context';
 	import { DatingApiError } from '../../_lib/api';
 	import type { DatingMatch, DatingMessage, DatingProfile } from '../../_lib/types';
@@ -18,14 +18,22 @@
 	let topError = $state<string | null>(null);
 	let timeline: HTMLElement | null = null;
 
+	// Re-run only when the URL match id changes (or the session
+	// transitions to / from authenticated). `load()` writes to several
+	// reactive cells; without `untrack` the effect would observe its
+	// own writes and loop forever.
+	let loadedFor = '';
 	$effect(() => {
 		const session = nexo.session();
+		const id = matchId;
 		if (session === null) return;
 		if (!session.authenticated) {
 			void goto('/dating/login', { replaceState: true });
 			return;
 		}
-		if (matchId !== '') void load();
+		if (id === '' || loadedFor === id) return;
+		loadedFor = id;
+		untrack(() => void load());
 	});
 
 	async function load() {
diff --git a/src/web/routes/dating/discover/+page.svelte b/src/web/routes/dating/discover/+page.svelte
index ea9f55b..f687d91 100644
--- a/src/web/routes/dating/discover/+page.svelte
+++ b/src/web/routes/dating/discover/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { untrack } from 'svelte';
 	import { getNexoContext } from '../_lib/context';
 	import { DatingApiError } from '../_lib/api';
 	import {
@@ -89,10 +90,18 @@
 		return caught instanceof Error ? caught.message : String(caught);
 	}
 
+	// Trigger the initial fetch when the session resolves to a usable
+	// state. `untrack` is critical: `load()` reads and writes `loading`
+	// reactively, so calling it inside a tracked branch would create a
+	// feedback loop (load → loading=true → effect re-fires → load → …)
+	// that hammers the API endlessly.
+	let initialised = false;
 	$effect(() => {
 		const session = nexo.session();
+		if (initialised) return;
 		if (session?.authenticated && session.profile?.completed) {
-			void load(true);
+			initialised = true;
+			untrack(() => void load(true));
 		}
 	});
 
diff --git a/src/web/routes/dating/matches/+page.svelte b/src/web/routes/dating/matches/+page.svelte
index eae4c5a..371881e 100644
--- a/src/web/routes/dating/matches/+page.svelte
+++ b/src/web/routes/dating/matches/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { untrack } from 'svelte';
 	import { getNexoContext } from '../_lib/context';
 	import { DatingApiError } from '../_lib/api';
 	import type { DatingMatch, DatingProfile } from '../_lib/types';
@@ -11,6 +12,10 @@
 	let loading = $state(true);
 	let error = $state<string | null>(null);
 
+	// `untrack` keeps the effect from re-firing on every reactive
+	// write `load()` performs (`loading` toggles true→false). Without
+	// it the page hits `/api/matches` continuously.
+	let initialised = false;
 	$effect(() => {
 		const session = nexo.session();
 		if (session === null) return;
@@ -18,7 +23,9 @@
 			void goto('/dating/login', { replaceState: true });
 			return;
 		}
-		void load();
+		if (initialised) return;
+		initialised = true;
+		untrack(() => void load());
 	});
 
 	async function load() {
diff --git a/src/web/routes/dating/profile/+page.svelte b/src/web/routes/dating/profile/+page.svelte
index abf22d6..1cea5be 100644
--- a/src/web/routes/dating/profile/+page.svelte
+++ b/src/web/routes/dating/profile/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { untrack } from 'svelte';
 	import { getNexoContext } from '../_lib/context';
 	import { DatingApiError } from '../_lib/api';
 	import {
@@ -29,6 +30,10 @@
 	let topError = $state<string | null>(null);
 	let fieldErrors = $state<Record<string, string>>({});
 
+	// `hydrate()` populates many reactive cells. Without `untrack`,
+	// the effect's own writes would re-trigger it and clobber any
+	// edits the user makes between renders.
+	let hydratedFor = '';
 	$effect(() => {
 		const session = nexo.session();
 		if (session === null) return;
@@ -40,7 +45,11 @@
 			void goto('/dating/onboarding', { replaceState: true });
 			return;
 		}
-		hydrate(session.profile);
+		const profileId = session.profile.id;
+		if (hydratedFor === profileId) return;
+		hydratedFor = profileId;
+		const next = session.profile;
+		untrack(() => hydrate(next));
 	});
 
 	function hydrate(next: DatingProfile) {
diff --git a/src/web/routes/dating/profile/photos/+page.svelte b/src/web/routes/dating/profile/photos/+page.svelte
index 9f4f242..08593d8 100644
--- a/src/web/routes/dating/profile/photos/+page.svelte
+++ b/src/web/routes/dating/profile/photos/+page.svelte
@@ -28,7 +28,13 @@
 			void goto('/dating/onboarding', { replaceState: true });
 			return;
 		}
-		profile = session.profile;
+		// Mirror the session-owned profile only when it actually
+		// changes — assigning the same reference still triggers
+		// reactivity in Svelte's `$state` proxies, which would re-run
+		// every consumer of `profile`.
+		if (profile?.id !== session.profile.id || profile?.updated !== session.profile.updated) {
+			profile = session.profile;
+		}
 	});
 
 	async function syncSession(updated: DatingProfile) {