diff --git a/webapp/web/templates/freemarker/body/error/error-display.ftl b/webapp/web/templates/freemarker/body/error/error-display.ftl
index 4ab973782..ebfc6ab7e 100644
--- a/webapp/web/templates/freemarker/body/error/error-display.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-display.ftl
@@ -11,15 +11,15 @@
     
 <#if adminErrorData??> <#-- view for site administrators -->
    <#if adminErrorData.errorMessage?has_content>
-        <p><strong>Error message:</strong> ${adminErrorData.errorMessage}</p>
+        <p><strong>Error message:</strong> ${adminErrorData.errorMessage?html}</p>
     </#if>
     <#if adminErrorData.stackTrace?has_content>
         <p>
-            <strong>Stack trace</strong> (full trace available in the vivo log): ${adminErrorData.stackTrace}
+            <strong>Stack trace</strong> (full trace available in the vivo log): ${adminErrorData.stackTrace?html}
         </p>
                    
         <#if adminErrorData.cause?has_content>
-            <p><strong>Caused by:</strong> ${adminErrorData.cause}</p>            
+            <p><strong>Caused by:</strong> ${adminErrorData.cause?html}</p>            
         </#if>
     </#if>