diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 57bb979d5..a27e491f8 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -1429,7 +1429,6 @@ RED.nodes = (function() {
         }
         // Order the groups to ensure they are outer-most to inner-most
         var groupDepthMap = {};
-        console.log(new_groups);
         for (i=0;i<new_groups.length;i++) {
             n = new_groups[i];
             if (n.g && node_map[n.g]) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index fa1d1731c..999c98587 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2416,7 +2416,9 @@ RED.view = (function() {
                         // connecting to a link node virual port.
                         if (!(
                             (d.type === "link out" && portType === PORT_TYPE_OUTPUT) ||
-                            (d.type === "link in" && portType === PORT_TYPE_INPUT)
+                            (d.type === "link in" && portType === PORT_TYPE_INPUT) ||
+                            (portType === PORT_TYPE_OUTPUT && mouseup_node.outputs === 0) ||
+                            (portType === PORT_TYPE_INPUT && mouseup_node.inputs === 0)
                         )) {
                             var existingLink = RED.nodes.filterLinks({source:src,target:dst,sourcePort: src_port}).length !== 0;
                             if (!existingLink) {