diff --git a/client/src/components/Workflow/Editor/Node.vue b/client/src/components/Workflow/Editor/Node.vue
index dc2711e4666..26a401f7683 100644
--- a/client/src/components/Workflow/Editor/Node.vue
+++ b/client/src/components/Workflow/Editor/Node.vue
@@ -250,6 +250,9 @@ export default {
             this.onRedraw();
         },
         onAddOutput(output, terminal) {
+            if (this.mapOver) {
+                terminal.setMapOver(this.mapOver);
+            }
             this.outputTerminals[output.name] = terminal;
             this.onRedraw();
         },
diff --git a/client/src/components/Workflow/Editor/modules/terminals.js b/client/src/components/Workflow/Editor/modules/terminals.js
index 9e2fab488d3..e7b1a79b82a 100644
--- a/client/src/components/Workflow/Editor/modules/terminals.js
+++ b/client/src/components/Workflow/Editor/modules/terminals.js
@@ -157,6 +157,7 @@ class Terminal extends EventEmitter {
         }
         if (!this.mapOver.equal(val)) {
             this.mapOver = val;
+            this.node.mapOver = output_val;
             Object.values(this.node.outputTerminals).forEach((outputTerminal) => {
                 outputTerminal.setMapOver(output_val);
             });