diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
index 62ec10ce3..3538a9d30 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -424,6 +424,17 @@ class Flow {
      */
     getGroupEnvSetting(node, group, name) {
         if (group) {
+            if (name === "GROUP_NAME") {
+                return [{
+                    val: group.name
+                }, null];
+            }
+            if (name === "GROUP_ID") {
+                return [{
+                    val: group.id
+                }, null];
+            }
+
             if (group.credentials === undefined) {
                 group.credentials = credentials.get(group.id) || {};
             }