diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 7f75cc4d97..c84c04aeed 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -846,7 +846,7 @@
 				format={format ?? ''}
 				bind:value
 				bind:editor
-				on:clear={() => {
+				onClear={() => {
 					defaultValue = null
 				}}
 				{showSchemaExplorer}
diff --git a/frontend/src/lib/components/ObjectResourceInput.svelte b/frontend/src/lib/components/ObjectResourceInput.svelte
index d6594a2ddd..6351b35e97 100644
--- a/frontend/src/lib/components/ObjectResourceInput.svelte
+++ b/frontend/src/lib/components/ObjectResourceInput.svelte
@@ -17,6 +17,7 @@
 		defaultValue: any
 		editor?: SimpleEditor | undefined
 		path?: string
+		onClear?: () => void
 	}
 
 	let {
@@ -26,7 +27,8 @@
 		showSchemaExplorer = false,
 		selectFirst = false,
 		defaultValue,
-		editor = $bindable(undefined)
+		editor = $bindable(undefined),
+		onClear = undefined
 	}: Props = $props()
 
 	function isResource() {
@@ -48,7 +50,7 @@
 		<ResourcePicker
 			{selectFirst}
 			{disablePortal}
-			on:clear
+			{onClear}
 			bind:value={
 				() => valueToPath(),
 				(v) => {
diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 87bd02d992..2dc3690b5a 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { ResourceService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
-	import { createEventDispatcher, onMount, untrack } from 'svelte'
+	import { onMount, untrack } from 'svelte'
 	import AppConnect from './AppConnectDrawer.svelte'
 	import ResourceEditorDrawer from './ResourceEditorDrawer.svelte'
 
@@ -11,10 +11,6 @@
 	import { sendUserToast } from '$lib/toast'
 	import { isDbType } from './apps/components/display/dbtable/utils'
 	import Select from './select/Select.svelte'
-	import { createDispatcherIfMounted } from '$lib/createDispatcherIfMounted'
-
-	const dispatch = createEventDispatcher()
-	const dispatchIfMounted = createDispatcherIfMounted(dispatch)
 
 	interface Props {
 		initialValue?: string | undefined
@@ -28,6 +24,7 @@
 		expressOAuthSetup?: boolean
 		defaultValues?: Record<string, any> | undefined
 		placeholder?: string | undefined
+		onClear?: () => void
 	}
 
 	let {
@@ -41,7 +38,8 @@
 		selectFirst = false,
 		expressOAuthSetup = false,
 		defaultValues = undefined,
-		placeholder = undefined
+		placeholder = undefined,
+		onClear = undefined
 	}: Props = $props()
 
 	if (initialValue && value == undefined) {
@@ -182,7 +180,7 @@
 					initialValue = undefined
 					value = undefined
 					valueType = undefined
-					dispatch('clear')
+					onClear?.()
 				}}
 				items={collection}
 				clearable