diff --git a/stock_picking_comment_template/views/report_delivery_document.xml b/stock_picking_comment_template/views/report_delivery_document.xml
index 181c2fb..3db082a 100644
--- a/stock_picking_comment_template/views/report_delivery_document.xml
+++ b/stock_picking_comment_template/views/report_delivery_document.xml
@@ -10,7 +10,7 @@
                 t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')"
                 t-as="comment_template_top"
             >
-                <div t-raw="comment_template_top.text" />
+                <div t-raw="o.render_comment(comment_template_top)" />
             </t>
         </xpath>
         <xpath expr="//div[hasclass('page')]" position="inside">
@@ -18,7 +18,7 @@
                 t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'after_lines')"
                 t-as="comment_template_bottom"
             >
-                <div t-raw="comment_template_bottom.text" />
+                <div t-raw="o.render_comment(comment_template_bottom)" />
             </t>
         </xpath>
     </template>
diff --git a/stock_picking_comment_template/views/report_picking.xml b/stock_picking_comment_template/views/report_picking.xml
index 607ec75..060c39b 100644
--- a/stock_picking_comment_template/views/report_picking.xml
+++ b/stock_picking_comment_template/views/report_picking.xml
@@ -7,7 +7,7 @@
                 t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'before_lines')"
                 t-as="comment_template_top"
             >
-                <div t-raw="comment_template_top.text" />
+                <div t-raw="o.render_comment(comment_template_top)" />
             </t>
         </xpath>
         <xpath expr="//p[@t-field='o.note']" position="after">
@@ -15,7 +15,7 @@
                 t-foreach="o.comment_template_ids.filtered(lambda x: x.position == 'after_lines')"
                 t-as="comment_template_bottom"
             >
-                <div t-raw="comment_template_bottom.text" />
+                <div t-raw="o.render_comment(comment_template_bottom)" />
             </t>
         </xpath>
     </template>