diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 13e7d11745..b07e1f73bf 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -130,18 +130,13 @@
 	let previousResourceType = resourceType
 
 	$effect(() => {
-		resourceType
+		$workspaceStore && resourceType
 		untrack(() => {
 			if (previousResourceType != resourceType) {
 				previousResourceType = resourceType
 				value = undefined
-				untrack(() => loadResources(resourceType))
 			}
 		})
-	})
-
-	$effect(() => {
-		$workspaceStore && resourceType
 		untrack(() => loadResources(resourceType))
 	})