diff --git a/frontend/src/lib/components/RunForm.svelte b/frontend/src/lib/components/RunForm.svelte
index 530d939d49..da4c61be04 100644
--- a/frontend/src/lib/components/RunForm.svelte
+++ b/frontend/src/lib/components/RunForm.svelte
@@ -77,7 +77,7 @@
 	}
 
 	let {
-		runnable = $bindable(),
+		runnable,
 		runAction,
 		buttonText = 'Run',
 		schedulable = true,
@@ -309,7 +309,7 @@
 								bind:scheduledForStr
 								bind:invisible_to_owner
 								bind:overrideTag
-								bind:runnable
+								{runnable}
 							/>
 						{/snippet}
 					</Popover>
diff --git a/frontend/src/lib/components/RunFormAdvancedPopup.svelte b/frontend/src/lib/components/RunFormAdvancedPopup.svelte
index 5766ad619a..97138d090c 100644
--- a/frontend/src/lib/components/RunFormAdvancedPopup.svelte
+++ b/frontend/src/lib/components/RunFormAdvancedPopup.svelte
@@ -70,7 +70,19 @@
 	{#if !$userStore?.operator}
 		{#if $workerTags && $workerTags?.length > 0}
 			<div class="w-full">
-				<select placeholder="Worker group" bind:value={overrideTag}>
+				<select
+					placeholder="Worker group"
+					bind:value={
+						() => overrideTag ?? '',
+						(v) => {
+							if (v == '') {
+								overrideTag = undefined
+							} else {
+								overrideTag = v
+							}
+						}
+					}
+				>
 					{#if overrideTag}
 						<option value="">reset to default</option>
 					{:else}