diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/SettingsChatHubView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/SettingsChatHubView.vue
index b3869656eee..99893f832d2 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/SettingsChatHubView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/SettingsChatHubView.vue
@@ -86,9 +86,11 @@ onMounted(async () => {
 	if (!settingsStore.isChatFeatureEnabled) {
 		return;
 	}
-	await fetchSettings();
-	await credentialsStore.fetchAllCredentials();
-	await credentialsStore.fetchCredentialTypes(false);
+	await Promise.all([
+		fetchSettings(),
+		credentialsStore.fetchAllCredentials(),
+		credentialsStore.fetchCredentialTypes(false),
+	]);
 });
 </script>
 <template>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatCredentials.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatCredentials.ts
index 991016b0596..1be9af32b17 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatCredentials.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatCredentials.ts
@@ -1,6 +1,5 @@
 import { LOCAL_STORAGE_CHAT_HUB_CREDENTIALS } from '@/app/constants';
 import { useSettingsStore } from '@/app/stores/settings.store';
-import { hasPermission } from '@/app/utils/rbac/permissions';
 import { credentialsMapSchema, type CredentialsMap } from '@/features/ai/chatHub/chat.types';
 import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
@@ -102,16 +101,9 @@ export function useChatCredentials(userId: string) {
 		() => projectStore.personalProject,
 		async (personalProject) => {
 			if (personalProject) {
-				const hasGlobalCredentialRead = hasPermission(['rbac'], {
-					rbac: { scope: 'credential:read' },
-				});
-
 				await Promise.all([
 					credentialsStore.fetchCredentialTypes(false),
-					// For non-owner users only fetch credentials from personal project.
-					hasGlobalCredentialRead
-						? credentialsStore.fetchAllCredentials()
-						: credentialsStore.fetchAllCredentials(personalProject.id),
+					credentialsStore.fetchAllCredentialsForWorkflow({ projectId: personalProject.id }),
 				]);
 
 				isInitialized.value = true;