diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html b/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html
index 0eaac69b..ca0d9470 100644
--- a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html
+++ b/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html
@@ -1,7 +1,7 @@
 <div>
   <embed
     src="data:${{displayModel.content_type}};base64,${{displayModel.data}}"
-    type="${{displayModel?.content_type}}"
+    type="{{displayModel?.content_type}}"
     [style]="{
       width: '100%',
       height: height
diff --git a/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html b/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html
index 2e13c33e..98780799 100644
--- a/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html
+++ b/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html
@@ -40,7 +40,7 @@
           <!--              </div>-->
         </div>
 
-        <div class="row pt-2" *ngIf="conditionGroup.related_resources.length > 0">
+        <div class="row pt-2" *ngIf="conditionGroup?.related_resources?.length > 0">
           <div class="col-12">
             <a class="cursor-pointer tx-indigo" (click)="collapse.toggle()">show all</a>
             <div #collapse="ngbCollapse" [ngbCollapse]="true">