diff --git a/packages/mermaid/src/rendering-util/rendering-elements/edges.js b/packages/mermaid/src/rendering-util/rendering-elements/edges.js
index 07d9ab096..4a9ab52cb 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/edges.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/edges.js
@@ -521,7 +521,7 @@ export const insertEdge = function (elem, edge, clusterDb, diagramType, startNod
   let svgPath;
   let linePath = lineFunction(lineData);
   const edgeStyles = Array.isArray(edge.style) ? edge.style : [edge.style];
-  let strokeColor = edgeStyles.find((style) => style.startsWith('stroke:'));
+  let strokeColor = edgeStyles.find((style) => style?.startsWith('stroke:'));
 
   if (edge.look === 'handDrawn') {
     const rc = rough.svg(elem);
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/erBox.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/erBox.ts
index 567197a5a..af1e9945a 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/erBox.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/erBox.ts
@@ -233,6 +233,10 @@ export async function erBox<T extends SVGGraphicsElement>(parent: D3Selection<T>
   yOffsets.push(0);
   // Draw row rects
   for (const [i, yOffset] of yOffsets.entries()) {
+    if (i === 0 && yOffsets.length > 1) {
+      continue;
+      // Skip first row
+    }
     const isEven = i % 2 === 0 && yOffset !== 0;
     const roughRect = rc.rectangle(x, nameBBox.height + y + yOffset, w, nameBBox.height, {
       ...options,