diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index d4fbc5102..2b95b35d3 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -495,11 +495,12 @@ RED.history = (function() {
                             // Reset - Only want to keep the changes
                             inverseEv.changes[i] = {};
                             for (const [key, value] of Object.entries(ev.changes[i])) {
-                                inverseEv.changes[i][key] = ev.node.credentials[key];
-                                ev.node.credentials[key] = value;
-                                if (ev.node._def.credentials[key]?.type === 'password') {
-                                    ev.node.credentials['has_' + key] = !!value;
+                                // Edge case: node.credentials is cleared after a deploy, so we can't
+                                // capture values for the inverse event when undoing past a deploy
+                                if (ev.node.credentials) {
+                                    inverseEv.changes[i][key] = ev.node.credentials[key];
                                 }
+                                ev.node.credentials[key] = value;
                             }
                         } else {
                             ev.node[i] = ev.changes[i];
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index bb4457f8c..fbb822418 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -808,17 +808,6 @@ RED.editor = (function() {
                 }
             }
 
-            const oldCreds = {};
-            if (editing_node._def.credentials) {
-                for (const prop in editing_node._def.credentials) {
-                    if (Object.prototype.hasOwnProperty.call(editing_node._def.credentials, prop)) {
-                        if (prop in editing_node.credentials) {
-                            oldCreds[prop] = editing_node.credentials[prop];
-                        }
-                    }
-                }
-            }
-
             try {
                 const rc = editing_node._def.oneditsave.call(editing_node);
                 if (rc === true) {
@@ -850,24 +839,6 @@ RED.editor = (function() {
                     }
                 }
             }
-
-            if (editing_node._def.credentials) {
-                for (const prop in editing_node._def.credentials) {
-                    if (Object.prototype.hasOwnProperty.call(editing_node._def.credentials, prop)) {
-                        if (oldCreds[prop] !== editing_node.credentials[prop]) {
-                            if (editing_node.credentials[prop] === '__PWRD__') {
-                                // The password may not exist in oldCreds
-                                // The value '__PWRD__' means the password exists,
-                                // so ignore this change
-                                continue;
-                            }
-                            editState.changes.credentials = editState.changes.credentials || {};
-                            editState.changes.credentials[prop] = oldCreds[prop];
-                            editState.changed = true;
-                        }
-                    }
-                }
-            }
         }
     }
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
index 396317052..88472f97e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
@@ -195,6 +195,7 @@
                             // Like the user sets a value, saves the config,
                             // reopens the config and save the config again
                         } else {
+                            changes['has_' + cred] = node.credentials['has_' + cred];
                             changes[cred] = node.credentials[cred];
                             node.credentials[cred] = value;
                         }