diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 0cdb26a857..13e7d11745 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -115,7 +115,7 @@
 				nc.push({ value: value ?? initialValue!, label: value ?? initialValue!, type: '' })
 			}
 			collection = nc
-			if (collection.length == 1 && selectFirst && value == undefined) {
+			if (collection.length == 1 && selectFirst && (value == undefined || value == '')) {
 				console.log('selectFirst', collection[0].value)
 				value = collection[0].value
 				valueType = collection[0].type
@@ -127,6 +127,19 @@
 		loading = false
 	}
 
+	let previousResourceType = resourceType
+
+	$effect(() => {
+		resourceType
+		untrack(() => {
+			if (previousResourceType != resourceType) {
+				previousResourceType = resourceType
+				value = undefined
+				untrack(() => loadResources(resourceType))
+			}
+		})
+	})
+
 	$effect(() => {
 		$workspaceStore && resourceType
 		untrack(() => loadResources(resourceType))
diff --git a/frontend/src/lib/components/workspaceSettings/AISettings.svelte b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
index 243da15aeb..dbeae226b2 100644
--- a/frontend/src/lib/components/workspaceSettings/AISettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
@@ -200,6 +200,7 @@
 								<!-- this can be removed once the parent component moves to runes -->
 								<!-- svelte-ignore binding_property_non_reactive -->
 								<ResourcePicker
+									selectFirst
 									resourceType={provider === 'openai' && usingOpenaiClientCredentialsOauth
 										? 'openai_client_credentials_oauth'
 										: provider}