diff --git a/cypress/platform/xss7.html b/cypress/platform/xss7.html
index f3403fded..454e028b2 100644
--- a/cypress/platform/xss7.html
+++ b/cypress/platform/xss7.html
@@ -54,11 +54,7 @@
         // themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}',
         logLevel: 0,
         state: {
-<<<<<<< HEAD
           defaultRenderer: 'dagre-d3',
-=======
-          defaultRenderer: 'dagre-wrapper',
->>>>>>> master
         },
         flowchart: {
           // defaultRenderer: 'dagre-wrapper',
diff --git a/src/diagrams/common/common.js b/src/diagrams/common/common.js
index b95ea7784..5f17d9bbf 100644
--- a/src/diagrams/common/common.js
+++ b/src/diagrams/common/common.js
@@ -65,6 +65,7 @@ const sanitizeMore = (text, config) => {
 };
 
 export const sanitizeText = (text, config) => {
+  if(!text) return text;
   const txt = DOMPurify.sanitize(sanitizeMore(text, config));
   return txt;
 };