diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index ba23b76fdc..e3d14e158f 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -210,7 +210,6 @@
 	export let folding = false
 	export let args: Record<string, any> | undefined = undefined
 	export let useWebsockets: boolean = true
-	export let listenEmptyChanges = false
 	export let small = false
 	export let scriptLang: Preview['language'] | 'bunnative'
 	export let disabled: boolean = false
@@ -413,6 +412,10 @@
 		}
 	}
 
+	export function getScriptLang(): string | undefined {
+		return scriptLang
+	}
+
 	let command: Disposable | undefined = undefined
 
 	let sqlTypeCompletor: Disposable | undefined = undefined
@@ -1147,10 +1150,8 @@
 			timeoutModel && clearTimeout(timeoutModel)
 			timeoutModel = setTimeout(() => {
 				let ncode = getCode()
-				if (ncode != '' || listenEmptyChanges) {
-					code = ncode
-					dispatch('change', code)
-				}
+				code = ncode
+				dispatch('change', code)
 			}, 500)
 
 			ataModel && clearTimeout(ataModel)
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 3b9fddf6cf..5e299226e3 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -221,7 +221,7 @@
 		scriptEditor?.disableCollaboration()
 		script.content = initialCode(language, kind, template)
 		scriptEditor?.inferSchema(script.content, language)
-		if (script.content != editor?.getCode()) {
+		if (script.content != editor?.getCode() && editor?.getScriptLang() == language) {
 			setCode(script.content)
 		}
 	}
@@ -647,9 +647,7 @@
 				</Tab>
 				<Tab value="triggers">
 					Triggers
-					<Tooltip
-						documentationLink="https://www.windmill.dev/docs/getting_started/triggers"
-					>
+					<Tooltip documentationLink="https://www.windmill.dev/docs/getting_started/triggers">
 						Configure how this script will be triggered.
 					</Tooltip>
 				</Tab>
diff --git a/frontend/src/lib/components/WorkerGroup.svelte b/frontend/src/lib/components/WorkerGroup.svelte
index 100468fb26..b87513cb8a 100644
--- a/frontend/src/lib/components/WorkerGroup.svelte
+++ b/frontend/src/lib/components/WorkerGroup.svelte
@@ -823,7 +823,6 @@
 						scriptLang={'bash'}
 						useWebsockets={false}
 						fixedOverflowWidgets={false}
-						listenEmptyChanges
 						code={config?.init_bash ?? ''}
 						on:change={(e) => {
 							if (config) {