diff --git a/frontend/src/lib/components/runs/RunsFilter.svelte b/frontend/src/lib/components/runs/RunsFilter.svelte
index c899b367de..0bd631e2ea 100644
--- a/frontend/src/lib/components/runs/RunsFilter.svelte
+++ b/frontend/src/lib/components/runs/RunsFilter.svelte
@@ -434,7 +434,10 @@
 		</div>
 		<div class="relative">
 			<span class="text-xs absolute -top-4">Status</span>
-			<ToggleButtonGroup bind:selected={success}>
+			<ToggleButtonGroup
+				bind:selected={success}
+				on:selected={() => dispatch('successChange', success)}
+			>
 				<ToggleButton value={undefined} label="All" />
 				<ToggleButton
 					value={'running'}
diff --git a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
index 26d75aced3..eab0f9a6ba 100644
--- a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
@@ -668,6 +668,11 @@
 					bind:allWorkspaces
 					bind:schedulePath
 					on:change={reloadJobsWithoutFilterError}
+					on:successChange={(e) => {
+						if (e.detail == 'running' && maxTs != undefined) {
+							maxTs = undefined
+						}
+					}}
 					{usernames}
 					{folders}
 					{paths}
@@ -1037,6 +1042,11 @@
 					bind:schedulePath
 					mobile={true}
 					on:change={reloadJobsWithoutFilterError}
+					on:sucessChange={(e) => {
+						if (e.detail == 'running' && maxTs != undefined) {
+							maxTs = undefined
+						}
+					}}
 				/>
 			</div>
 		</div>