diff --git a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/narrative/DiagnosticReport.html b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/narrative/DiagnosticReport.html
index 517aca8461f..64894e0f3d2 100644
--- a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/narrative/DiagnosticReport.html
+++ b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/narrative/DiagnosticReport.html
@@ -17,12 +17,12 @@
 			<th:block th:case="'DSTU1'">
 				<th:block th:if="${not resource.name.textElement.empty}" th:text="${resource.name.textElement.value}"/>
 				<th:block th:if="    ${resource.name.textElement.empty} and ${not resource.name.coding[0].displayElement.empty}" th:text="${resource.name.coding[0].display}"/>
-				<th:block th:if=    "${resource.name.textElement.empty} and     ${resource.name.coding[0].displayElement.empty}" th:text="Untitled Diagnostic Report"/>
+				<th:block th:if=    "${resource.name.textElement.empty} and     ${resource.name.coding[0].displayElement.empty}" th:text="'Untitled Diagnostic Report'"/>
 			</th:block>
 			<th:block th:case="*">
 				<th:block th:if="${not resource.code.textElement.empty} or ${resource.code.coding.empty}" th:text="${resource.code.textElement.value}"/>
 				<th:block th:if="${not resource.code.coding.empty} and ${resource.code.textElement.empty} and ${not resource.code.coding[0].displayElement.empty}" th:text="${resource.code.coding[0].display}"/>
-				<th:block th:if="${not resource.code.coding.empty} and ${resource.code.textElement.empty} and     ${resource.code.coding[0].displayElement.empty}" th:text="Untitled Diagnostic Report"/>
+				<th:block th:if="${not resource.code.coding.empty} and ${resource.code.textElement.empty} and     ${resource.code.coding[0].displayElement.empty}" th:text="'Untitled Diagnostic Report'"/>
 			</th:block>
 		</th:block>
 		<!--/*--> Complete Blood Count <!--*/-->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5ea1bc7a439..da938846fcf 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -327,6 +327,11 @@
 				resource as the resource type in order to hold a JSONPatch or XMLPatch body)
 				has been added to the JPA server.
 			</action>
+			<action type="fix" issue="1390">
+				Two issues in the Thymeleaf Narrative Template which caused an error when generating
+				a narrative on an untitled DiagnosticReport were fixed. Thanks to GitHub
+				user @navyflower for reporting!
+			</action>
 		</release>
 		<release version="3.8.0" date="2019-05-30" description="Hippo">
 			<action type="fix">