diff --git a/frontend/src/lib/components/mcp/McpScopeSelector.svelte b/frontend/src/lib/components/mcp/McpScopeSelector.svelte
index e7efdb472c..dbf525a90c 100644
--- a/frontend/src/lib/components/mcp/McpScopeSelector.svelte
+++ b/frontend/src/lib/components/mcp/McpScopeSelector.svelte
@@ -97,7 +97,7 @@
 
 	// Clear folders when not in folder mode, load folder names when entering folder mode
 	$effect(() => {
-		if (selectedMode === 'folder' && workspaceId) {
+		if (workspaceId && selectedMode === 'folder') {
 			selectedFolders = []
 			loadFolderNames(workspaceId)
 		} else {