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 b7d6d00f9..678bd71d3 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
@@ -452,9 +452,9 @@ RED.history = (function() {
                 }
             }
 
-            if(ev.sideEffectCallback && typeof ev.sideEffectCallback === 'function') {
-                inverseEv.sideEffectCallback = ev.sideEffectCallback;
-                ev.sideEffectCallback(ev);
+            if(ev.callback && typeof ev.callback === 'function') {
+                inverseEv.callback = ev.callback;
+                ev.callback(ev);
             }
 
             Object.keys(modifiedTabs).forEach(function(id) {
diff --git a/packages/node_modules/@node-red/nodes/core/common/21-debug.html b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
index c79e08672..1e5e8c29a 100644
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
@@ -101,7 +101,7 @@
                         },
                         dirty:node.dirty,
                         changed:node.changed,
-                        sideEffectCallback: function(ev) {
+                        callback: function(ev) {
                             activateAjaxCall(ev.node, ev.node.active);
                         }
                     };
@@ -119,6 +119,7 @@
             }
         },
         onpaletteadd: function() {
+            console.log(RED);
             var options = {
                 messageMouseEnter: function(sourceId) {
                     if (sourceId) {
@@ -284,21 +285,23 @@
                 RED.nodes.eachNode(function(n) {
                     if (n.type === "debug" && n.active === true) {
                         if (globally === true || n.z == RED.workspaces.active()) {
-                            historyEvents.push({
-                                t: "edit",
-                                node: n,
-                                changed: n.changed,
-                                changes: {
-                                    active: n.active
-                                },
-                                sideEffectCallback: function() {
-                                    activateAjaxCall(n, n.active);
-                                }
-                            });
-                            n.active = false;
-                            n.changed = true;
-                            n.dirty = true;
-                            activateAjaxCall(n, n.active);
+                            if(RED.nodes.subflow(n.z) === undefined) {
+                                historyEvents.push({
+                                    t: "edit",
+                                    node: n,
+                                    changed: n.changed,
+                                    changes: {
+                                        active: n.active
+                                    },
+                                    callback: function() {
+                                        activateAjaxCall(n, n.active);
+                                    }
+                                });
+                                n.active = false;
+                                n.changed = true;
+                                n.dirty = true;
+                                activateAjaxCall(n, n.active);
+                            }
                         }
                     }
                 });