diff --git a/themes/grav/templates/forms/fields/markdown/markdown.html.twig b/themes/grav/templates/forms/fields/markdown/markdown.html.twig
index 13c023de..4c5363b7 100644
--- a/themes/grav/templates/forms/fields/markdown/markdown.html.twig
+++ b/themes/grav/templates/forms/fields/markdown/markdown.html.twig
@@ -2,6 +2,6 @@
 
 <div class="form-field">
     <div class="form-data form-markdown-wrapper cm-s-paper">
-        <textarea data-grav-mdeditor="{{ { 'markdown': true }|json_encode|e('html_attr') }}" name="{{ (scope ~ field.name)|fieldName }}" data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json">{{ value|join("\n") }}</textarea>
+        <textarea data-grav-mdeditor="{{ { 'markdown': true }|json_encode|e('html_attr') }}" name="{{ (scope ~ field.name)|fieldName }}" data-grav-urlpreview="{{ base_url }}/media/{{ admin.route|trim('/') }}.json">{{ value|join("\n")|e('html') }}</textarea>
     </div>
 </div>
diff --git a/themes/grav/templates/forms/fields/textarea/textarea.html.twig b/themes/grav/templates/forms/fields/textarea/textarea.html.twig
index 089f7a4c..af2315ce 100644
--- a/themes/grav/templates/forms/fields/textarea/textarea.html.twig
+++ b/themes/grav/templates/forms/fields/textarea/textarea.html.twig
@@ -16,6 +16,6 @@
                 {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
                 {% if field.validate.message %}title="{{ field.validate.message|tu }}"{% endif %}
             {% endblock %}
-            >{{ value|trim }}</textarea>
+            >{{ value|trim|e('html') }}</textarea>
     </div>
 {% endblock %}
\ No newline at end of file