diff --git a/src/diagrams/gitGraph/gitGraphRenderer.js b/src/diagrams/gitGraph/gitGraphRenderer.js
index 8392c9ce1..e77647a61 100644
--- a/src/diagrams/gitGraph/gitGraphRenderer.js
+++ b/src/diagrams/gitGraph/gitGraphRenderer.js
@@ -48,7 +48,7 @@ function svgCreateDefs (svg) {
     .attr('y', config.nodeLabel.y)
     .attr('class', 'node-label')
     .attr('requiredFeatures', 'http://www.w3.org/TR/SVG11/feature#Extensibility')
-    .append('xhtml:p')
+    .append('p')
     .html('')
 }
 
diff --git a/src/mermaidAPI.js b/src/mermaidAPI.js
index 33263b6f6..a844aa8bb 100644
--- a/src/mermaidAPI.js
+++ b/src/mermaidAPI.js
@@ -432,7 +432,7 @@ const render = function (id, txt, cb, container) {
   s.innerHTML = scope(themes[config.theme] || defaultTheme, `#${id}`)
   svg.insertBefore(s, svg.firstChild)
 
-  d3.select('#d' + id).selectAll('foreignobject div').attr('xmlns', 'http://www.w3.org/1999/xhtml')
+  d3.select('#' + id).selectAll('foreignobject > *').attr('xmlns', 'http://www.w3.org/1999/xhtml')
 
   let url = ''
   if (config.arrowMarkerAbsolute) {