diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 5b00478fc381f..abc495bc28697 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -17,7 +17,7 @@
 			>
 				<div v-if="readonly || isReadOnly">
 					<n8n-input
-						:value="selected && selected[credentialTypeDescription.name] && selected[credentialTypeDescription.name].name"
+						:value="getSelectedName(credentialTypeDescription.name)"
 						disabled
 						size="small"
 					/>
@@ -26,7 +26,12 @@
 					v-else
 					:class="issues.length ? $style.hasIssues : $style.input"
 				>
-					<n8n-select :value="getSelectedId(credentialTypeDescription.name)" @change="(value) => onCredentialSelected(credentialTypeDescription.name, value)" :placeholder="$locale.baseText('nodeCredentials.selectCredential')" size="small">
+					<n8n-select
+						:value="getSelectedId(credentialTypeDescription.name)"
+						@change="(value) => onCredentialSelected(credentialTypeDescription.name, value)"
+						:placeholder="getSelectPlaceholder(credentialTypeDescription.name, issues)"
+						size="small"
+					>
 						<n8n-option
 							v-for="(item) in getCredentialOptions(credentialTypeDescription.name)"
 							:key="item.id"
@@ -180,6 +185,14 @@ export default mixins(
 			}
 			return undefined;
 		},
+		getSelectedName(type: string) {
+			return this.selected?.[type]?.name;
+		},
+		getSelectPlaceholder(type: string, issues: string[]) {
+			return issues.length && this.getSelectedName(type)
+				? this.$locale.baseText('nodeCredentials.selectedCredentialUnavailable', { interpolate: { name: this.getSelectedName(type) } })
+				: this.$locale.baseText('nodeCredentials.selectCredential');
+		},
 		credentialInputWrapperStyle (credentialType: string) {
 			let deductWidth = 0;
 			const styles = {
diff --git a/packages/editor-ui/src/mixins/nodeHelpers.ts b/packages/editor-ui/src/mixins/nodeHelpers.ts
index b282e27740083..6c6199cf83a7c 100644
--- a/packages/editor-ui/src/mixins/nodeHelpers.ts
+++ b/packages/editor-ui/src/mixins/nodeHelpers.ts
@@ -340,7 +340,8 @@ export const nodeHelpers = mixins(
 						}
 
 						if (nameMatches.length === 0) {
-							if (!this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.WorkflowSharing)) {
+							const isCredentialUsedInWorkflow = this.workflowsStore.usedCredentials?.[selectedCredentials.id as string];
+							if (!isCredentialUsedInWorkflow) {
 								foundIssues[credentialTypeDescription.name] = [this.$locale.baseText('nodeIssues.credentials.doNotExist', { interpolate: { name: selectedCredentials.name, type: credentialDisplayName } }), this.$locale.baseText('nodeIssues.credentials.doNotExist.hint')];
 							}
 						}
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 92044d2291820..ceaaca9a4662b 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -721,6 +721,7 @@
 	"nodeCredentials.credentialFor": "Credential for {credentialType}",
 	"nodeCredentials.issues": "Issues",
 	"nodeCredentials.selectCredential": "Select Credential",
+	"nodeCredentials.selectedCredentialUnavailable": "{name} (unavailable)",
 	"nodeCredentials.showMessage.message": "Nodes that used credential \"{oldCredentialName}\" have been updated to use \"{newCredentialName}\"",
 	"nodeCredentials.showMessage.title": "Node credential updated",
 	"nodeCredentials.updateCredential": "Update Credential",