diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
index 001ed6efff..80da1a2e29 100644
--- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -330,24 +330,25 @@ export const workflowHelpers = mixins(
 					if (node.credentials !== undefined && nodeType.credentials !== undefined) {
 						const saveCredenetials: INodeCredentials = {};
 						for (const nodeCredentialTypeName of Object.keys(node.credentials)) {
-							// todo revert to only set actually used credentials on workflow
-							// if (this.hasProxyAuth(node) || Object.keys(node.parameters).includes('genericAuthType')) {
-							// 	saveCredenetials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
-							// 	continue;
-							// }
+							if (this.hasProxyAuth(node) || Object.keys(node.parameters).includes('genericAuthType')) {
+								saveCredenetials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
+								continue;
+							}
 
-							// const credentialTypeDescription = nodeType.credentials
-							// 	.find((credentialTypeDescription) => credentialTypeDescription.name === nodeCredentialTypeName);
+							const credentialTypeDescription = nodeType.credentials
+								// filter out credentials with same name in different node versions
+								.filter((c) => this.displayParameter(node.parameters, c, '', node))
+								.find((c) => c.name === nodeCredentialTypeName);
 
-							// if (credentialTypeDescription === undefined) {
-							// 	// Credential type is not know so do not save
-							// 	continue;
-							// }
+							if (credentialTypeDescription === undefined) {
+								// Credential type is not know so do not save
+								continue;
+							}
 
-							// if (this.displayParameter(node.parameters, credentialTypeDescription, '', node) === false) {
-							// 	// Credential should not be displayed so do also not save
-							// 	continue;
-							// }
+							if (this.displayParameter(node.parameters, credentialTypeDescription, '', node) === false) {
+								// Credential should not be displayed so do also not save
+								continue;
+							}
 
 							saveCredenetials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName];
 						}