diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
index d795fb2a1..f7b88dc9c 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
@@ -595,7 +595,7 @@ public class XmlParser extends ParserBase {
       if (element.getType().equals("xhtml")) {
         String rawXhtml = element.getValue();
         if (isCdaText(element.getProperty())) {
-          new CDANarrativeFormat().convert(xml, element.getXhtml());
+          new CDANarrativeFormat().convert(xml, new XhtmlParser().parseFragment(rawXhtml));
         } else {
           xml.escapedText(rawXhtml);
           xml.anchor("end-xhtml");