diff --git a/cypress/integration/other/configuration.spec.js b/cypress/integration/other/configuration.spec.js
index 3b6e12cf20..7f47b57e8b 100644
--- a/cypress/integration/other/configuration.spec.js
+++ b/cypress/integration/other/configuration.spec.js
@@ -128,20 +128,24 @@ describe('Configuration', () => {
   });
 
   describe('suppressErrorRendering', () => {
+    beforeEach(() => {
+      cy.on('uncaught:exception', (err, runnable) => {
+        return !err.message.includes('Parse error on line');
+      });
+      cy.viewport(1440, 1024);
+    });
+
     it('should not render error diagram if suppressErrorRendering is set', () => {
       const url = 'http://localhost:9000/suppressError.html?suppressErrorRendering=true';
-      cy.viewport(1440, 1024);
       cy.visit(url);
       cy.window().should('have.property', 'rendered', true);
       cy.get('#test')
         .find('svg')
         .should(($svg) => {
-          expect($svg).to.have.length(2); // all failing diagrams should not appear!
-          $svg.each((_index, svg) => {
-            expect(cy.$$(svg)).to.be.visible();
-            // none of the diagrams should be error diagrams
-            expect($svg).to.not.contain('Syntax error');
-          });
+          // all failing diagrams should not appear!
+          expect($svg).to.have.length(2);
+          // none of the diagrams should be error diagrams
+          expect($svg).to.not.contain('Syntax error');
         });
       cy.matchImageSnapshot(
         'configuration.spec-should-not-render-error-diagram-if-suppressErrorRendering-is-set'
@@ -150,10 +154,16 @@ describe('Configuration', () => {
 
     it('should render error diagram if suppressErrorRendering is not set', () => {
       const url = 'http://localhost:9000/suppressError.html';
-      cy.viewport(1440, 1024);
       cy.visit(url);
       cy.window().should('have.property', 'rendered', true);
-      cy.get('#test');
+      cy.get('#test')
+        .find('svg')
+        .should(($svg) => {
+          // all five diagrams should be rendered
+          expect($svg).to.have.length(5);
+          // some of the diagrams should be error diagrams
+          expect($svg).to.contain('Syntax error');
+        });
       cy.matchImageSnapshot(
         'configuration.spec-should-render-error-diagram-if-suppressErrorRendering-is-not-set'
       );
diff --git a/cypress/platform/suppressError.html b/cypress/platform/suppressError.html
index 02591ce705..347a82c79c 100644
--- a/cypress/platform/suppressError.html
+++ b/cypress/platform/suppressError.html
@@ -47,9 +47,12 @@
       const shouldSuppress =
         new URLSearchParams(window.location.search).get('suppressErrorRendering') === 'true';
       mermaid.initialize({ startOnLoad: false, suppressErrorRendering: shouldSuppress });
-      await mermaid.run();
-      if (window.Cypress) {
-        window.rendered = true;
+      try {
+        await mermaid.run();
+      } catch {
+        if (window.Cypress) {
+          window.rendered = true;
+        }
       }
     </script>
   </body>