diff --git a/package.json b/package.json
index 1343af50c..715d09a5b 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
         "marked": "4.0.17",
         "minami": "1.2.3",
         "mocha": "9.2.2",
-        "node-red-node-test-helper": "^0.2.7",
+        "node-red-node-test-helper": "^0.3.0",
         "nodemon": "2.0.16",
         "proxy": "^1.0.2",
         "sass": "1.52.3",
diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.js b/packages/node_modules/@node-red/nodes/core/common/60-link.js
index 24572f8b1..08bad7a62 100644
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.js
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.js
@@ -109,16 +109,13 @@ module.exports = function(RED) {
             },
             remove(node) {
                 const target = generateTarget(node);
-                const tn = this.getTarget(target.name, target.flowId);
-                if (tn) {
-                    const targs = this.getTargets(tn.name);
-                    const idx = getIndex(targs, tn.id);
-                    if (idx > -1) {
-                        targs.splice(idx, 1);
-                    }
-                    if (targs.length === 0) {
-                        delete registry.name[tn.name];
-                    }
+                const targs = this.getTargets(target.name);
+                const idx = getIndex(targs, target.id);
+                if (idx > -1) {
+                    targs.splice(idx, 1);
+                }
+                if (targs.length === 0) {
+                    delete registry.name[tn.name];
                 }
                 delete registry.id[target.id];
             },
diff --git a/test/nodes/core/common/60-link_spec.js b/test/nodes/core/common/60-link_spec.js
index 63733455c..be7ffc39f 100644
--- a/test/nodes/core/common/60-link_spec.js
+++ b/test/nodes/core/common/60-link_spec.js
@@ -17,6 +17,7 @@
 var should = require("should");
 var linkNode = require("nr-test-utils").require("@node-red/nodes/core/common/60-link.js");
 var helper = require("node-red-node-test-helper");
+var clone = require("clone");
 
 describe('link Node', function() {
 
@@ -319,6 +320,48 @@ describe('link Node', function() {
                 linkCall.receive({ payload: "hello", target: "double payload" });
             });
         })
+        it('should not raise error after deploying a name change to a duplicate link-in node', async function () {
+            this.timeout(400);
+            const flow = [
+                { id: "tab-flow-1", type: "tab", label: "Flow 1" },
+                { id: "link-in-1", z: "tab-flow-1", type: "link in", name: "duplicate", wires: [["link-out-1"]] },
+                { id: "link-in-2", z: "tab-flow-1", type: "link in", name: "duplicate", wires: [["link-out-1"]] }, //duplicate name
+                { id: "link-out-1", z: "tab-flow-1", type: "link out", mode: "return" },
+                { id: "link-call", z: "tab-flow-1", type: "link call", linkType: "dynamic", links: [], wires: [["n4"]] },
+                { id: "n4", z: "tab-flow-1", type: "helper" }
+            ];
+
+            await helper.load(linkNode, flow)
+
+            const linkIn2before = helper.getNode("link-in-2");
+            linkIn2before.should.have.property("name", "duplicate") // check link-in-2 has been deployed with the duplicate name
+
+            //modify the flow and deploy change
+            const newConfig = clone(flow);
+            newConfig[2].name = "add" // change nodes name
+            await helper.setFlows(newConfig, "nodes") // deploy "nodes" only
+
+            const helperNode = helper.getNode("n4");
+            const linkCall2 = helper.getNode("link-call");
+            const linkIn2after = helper.getNode("link-in-2");
+            linkIn2after.should.have.property("name", "add") // check link-in-2 no longer has a duplicate name
+
+            //poke { payload: "hello", target: "add" } into the link-call node and 
+            //ensure that a message arrives via the link-in node named "add"
+            await new Promise((resolve, reject) => {
+                helperNode.on("input", function (msg) {
+                    try {
+                        msg.should.have.property("target", "add");
+                        msg.should.not.have.property("error");
+                        resolve()
+                    } catch (err) {
+                        reject(err);
+                    }
+                });
+                linkCall2.receive({ payload: "hello", target: "add" });
+            });
+
+        })
         it('should allow nested link-call flows', function(done) {
             this.timeout(500);
             var flow = [/** Multiply by 2 link flow **/