diff --git a/packages/mermaid-layout-elk/src/render.ts b/packages/mermaid-layout-elk/src/render.ts
index bdf72b611..80abea986 100644
--- a/packages/mermaid-layout-elk/src/render.ts
+++ b/packages/mermaid-layout-elk/src/render.ts
@@ -145,11 +145,14 @@ const drawNodes = async (relX, relY, nodeArray, svg, subgraphsEl, depth) => {
       }
     })
   );
-  nodeArray.forEach(function (node) {
-    if (node?.isGroup) {
-      await drawNodes(relX + node.x, relY + node.y, node.children, svg, subgraphsEl, depth + 1);
-    }
-  });
+
+  await Promise.all(
+    nodeArray.map(async function (node) {
+      if (node?.isGroup) {
+        await drawNodes(relX + node.x, relY + node.y, node.children, svg, subgraphsEl, depth + 1);
+      }
+    })
+  );
 };
 
 const getNextPort = (node, edgeDirection, graphDirection) => {
@@ -715,20 +718,20 @@ function intersectLine(p1, p2, q1, q2) {
   // Algorithm from J. Avro, (ed.) Graphics Gems, No 2, Morgan Kaufmann, 1994,
   // p7 and p473.
 
-  const a1, a2, b1, b2, c1, c2;
-  const r1, r2, r3, r4;
-  const denom, offset, num;
-  const x, y;
+  // let a1, a2, b1, b2, c1, c2;
+  // let r1, r2, r3, r4;
+  // let denom, offset, num;
+  // let x, y;
 
   // Compute a1, b1, c1, where line joining points 1 and 2 is F(x,y) = a1 x +
   // b1 y + c1 = 0.
-  a1 = p2.y - p1.y;
-  b1 = p1.x - p2.x;
-  c1 = p2.x * p1.y - p1.x * p2.y;
+  const a1 = p2.y - p1.y;
+  const b1 = p1.x - p2.x;
+  const c1 = p2.x * p1.y - p1.x * p2.y;
 
   // Compute r3 and r4.
-  r3 = a1 * q1.x + b1 * q1.y + c1;
-  r4 = a1 * q2.x + b1 * q2.y + c1;
+  const r3 = a1 * q1.x + b1 * q1.y + c1;
+  const r4 = a1 * q2.x + b1 * q2.y + c1;
 
   // Check signs of r3 and r4. If both point 3 and point 4 lie on
   // same side of line 1, the line segments do not intersect.
@@ -737,13 +740,13 @@ function intersectLine(p1, p2, q1, q2) {
   }
 
   // Compute a2, b2, c2 where line joining points 3 and 4 is G(x,y) = a2 x + b2 y + c2 = 0
-  a2 = q2.y - q1.y;
-  b2 = q1.x - q2.x;
-  c2 = q2.x * q1.y - q1.x * q2.y;
+  const a2 = q2.y - q1.y;
+  const b2 = q1.x - q2.x;
+  const c2 = q2.x * q1.y - q1.x * q2.y;
 
   // Compute r1 and r2
-  r1 = a2 * p1.x + b2 * p1.y + c2;
-  r2 = a2 * p2.x + b2 * p2.y + c2;
+  const r1 = a2 * p1.x + b2 * p1.y + c2;
+  const r2 = a2 * p2.x + b2 * p2.y + c2;
 
   // Check signs of r1 and r2. If both point 1 and point 2 lie
   // on same side of second line segment, the line segments do
@@ -753,21 +756,21 @@ function intersectLine(p1, p2, q1, q2) {
   }
 
   // Line segments intersect: compute intersection point.
-  denom = a1 * b2 - a2 * b1;
+  const denom = a1 * b2 - a2 * b1;
   if (denom === 0) {
     return /*COLLINEAR*/;
   }
 
-  offset = Math.abs(denom / 2);
+  const offset = Math.abs(denom / 2);
 
   // The denom/2 is to get rounding instead of truncating. It
   // is added or subtracted to the numerator, depending upon the
   // sign of the numerator.
   num = b1 * c2 - b2 * c1;
-  x = num < 0 ? (num - offset) / denom : (num + offset) / denom;
+  const x = num < 0 ? (num - offset) / denom : (num + offset) / denom;
 
   num = a2 * c1 - a1 * c2;
-  y = num < 0 ? (num - offset) / denom : (num + offset) / denom;
+  const y = num < 0 ? (num - offset) / denom : (num + offset) / denom;
 
   return { x: x, y: y };
 }