diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 945fcc7a1b..99158b0f3d 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -15,7 +15,7 @@
 	import { computeGlobalContext, eval_like } from './eval'
 	import InputValue from './InputValue.svelte'
 	import RefreshButton from './RefreshButton.svelte'
-	import { selectId } from '../../editor/appUtils'
+	import { clearErrorByComponentId, selectId } from '../../editor/appUtils'
 
 	// Component props
 	export let id: string
@@ -365,6 +365,9 @@
 
 	onDestroy(() => {
 		$initialized.initializedComponents = $initialized.initializedComponents.filter((c) => c !== id)
+		$errorByComponent = clearErrorByComponentId(id, $errorByComponent)
+		delete $runnableComponents[id]
+		$runnableComponents = $runnableComponents
 	})
 </script>
 
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentInputTypeEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentInputTypeEditor.svelte
index ee4bc29a03..7ffb64fca8 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/ComponentInputTypeEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/ComponentInputTypeEditor.svelte
@@ -24,7 +24,12 @@
 {#if componentInput.fieldType !== 'any'}
 	<div class="w-full">
 		<div class="mx-auto" bind:clientWidth>
-			<ToggleButtonGroup on:selected={() => onchange?.()} bind:selected={componentInput.type}>
+			<ToggleButtonGroup
+				on:selected={() => {
+					onchange?.()
+				}}
+				bind:selected={componentInput.type}
+			>
 				{#if componentInput.fieldType === 'template'}
 					<ToggleButton
 						tooltip={`Templated string (use \$\{<output>.x\} )`}