diff --git a/frontend/src/lib/components/codeGen/ScriptFix.svelte b/frontend/src/lib/components/codeGen/ScriptFix.svelte
index 31947b7ced..287b89e85d 100644
--- a/frontend/src/lib/components/codeGen/ScriptFix.svelte
+++ b/frontend/src/lib/components/codeGen/ScriptFix.svelte
@@ -19,7 +19,6 @@
 
 	// state
 	let genLoading: boolean = false
-	let openaiAvailable: boolean | undefined = undefined
 	let generatedCode = ''
 	let explanation = ''
 
@@ -65,13 +64,6 @@
 		explanation = ''
 	}
 
-	function checkIfOpenaiAvailable(
-		lang: SupportedLanguage | 'frontend',
-		existsOpenaiResourcePath: boolean
-	) {
-		openaiAvailable = existsOpenaiResourcePath && SUPPORTED_LANGUAGES.has(lang)
-	}
-
 	function showDiff() {
 		diffEditor?.setDiff(editor?.getCode() || '', generatedCode, scriptLangToEditorLang(lang))
 		diffEditor?.show()
@@ -83,8 +75,6 @@
 		diffEditor?.hide()
 	}
 
-	$: checkIfOpenaiAvailable(lang, $existsOpenaiResourcePath)
-
 	$: lang && (generatedCode = '')
 
 	$: generatedCode && showDiff()
@@ -92,7 +82,7 @@
 </script>
 
 {#if error}
-	{#if openaiAvailable}
+	{#if existsOpenaiResourcePath && SUPPORTED_LANGUAGES.has(lang)}
 		<div class="mt-2">
 			{#if generatedCode}
 				<div class="flex gap-1">
diff --git a/frontend/src/lib/components/codeGen/ScriptGen.svelte b/frontend/src/lib/components/codeGen/ScriptGen.svelte
index 16e0d42cb7..ec075870ab 100644
--- a/frontend/src/lib/components/codeGen/ScriptGen.svelte
+++ b/frontend/src/lib/components/codeGen/ScriptGen.svelte
@@ -27,7 +27,6 @@
 	// state
 	let funcDesc: string = ''
 	let genLoading: boolean = false
-	let openaiAvailable: boolean | undefined = undefined
 	let button: HTMLButtonElement | undefined
 	let input: HTMLInputElement | undefined
 	let generatedCode = ''
@@ -79,13 +78,6 @@
 		generatedCode = ''
 	}
 
-	function checkIfOpenaiAvailable(
-		lang: SupportedLanguage | 'frontend',
-		existsOpenaiResourcePath: boolean
-	) {
-		openaiAvailable = existsOpenaiResourcePath && SUPPORTED_LANGUAGES.has(lang)
-	}
-
 	function showDiff() {
 		diffEditor?.setDiff(
 			editor?.getCode() || '',
@@ -107,8 +99,6 @@
 		})
 	}
 
-	$: checkIfOpenaiAvailable(lang, $existsOpenaiResourcePath)
-
 	$: input?.focus()
 
 	$: lang && (generatedCode = '')
@@ -168,7 +158,7 @@
 		</div>
 	{/if}
 {/if}
-{#if !generatedCode}
+{#if !generatedCode && SUPPORTED_LANGUAGES.has(lang)}
 	<Popup floatingConfig={{ placement: 'bottom-end', strategy: 'absolute' }} let:close>
 		<svelte:fragment slot="button">
 			{#if inlineScript}
@@ -200,7 +190,7 @@
 			{/if}
 		</svelte:fragment>
 		<label class="block text-primary">
-			{#if openaiAvailable}
+			{#if $existsOpenaiResourcePath}
 				<div class="flex w-96">
 					<input
 						type="text"