diff --git a/frontend/src/routes/briefwechsel/+page.svelte b/frontend/src/routes/briefwechsel/+page.svelte
index 7587aa58..38bf1f61 100644
--- a/frontend/src/routes/briefwechsel/+page.svelte
+++ b/frontend/src/routes/briefwechsel/+page.svelte
@@ -28,6 +28,8 @@ $effect(() => {
 });
 
 const isSinglePerson = $derived(!!senderId && !receiverId);
+const showHero = $derived(!senderId && !data.filters.senderId);
+
 let showAdvanced = $state(false);
 
 const RECENT_STORAGE_KEY = 'korrespondenz_recent_persons';
@@ -94,8 +96,8 @@ function selectPerson(id: string) {
 }
 </script>
 
-{#if !senderId}
-	<!-- Hero state: centred discovery view -->
+{#if showHero}
+	<!-- Hero state: only on fresh page load with no context -->
 	<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
 		<CorrespondenzHero onSelectPerson={selectPerson} recentPersons={recentPersons} />
 	</div>
diff --git a/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte b/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
index e1e69ede..6d2fa29a 100644
--- a/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
@@ -76,7 +76,7 @@ function handleSuggestionSelect(id: string) {
 			bind:value={senderId}
 			initialName={initialSenderName}
 			restrictToCorrespondentsOf={receiverId || undefined}
-			onchange={() => onapplyFilters()}
+			onchange={(id) => { if (id) onapplyFilters(); }}
 		/>
 	</div>