diff --git a/addons/account_edi_ubl/data/ubl_templates.xml b/addons/account_edi_ubl/data/ubl_templates.xml
index e6d929248e9..ee1788af29b 100644
--- a/addons/account_edi_ubl/data/ubl_templates.xml
+++ b/addons/account_edi_ubl/data/ubl_templates.xml
@@ -117,7 +117,7 @@
                 <cbc:ID t-esc="record.name"/>
                 <cbc:IssueDate t-esc="record.invoice_date"/>
                 <cbc:InvoiceTypeCode t-esc="type_code"/>
-                <cbc:Note t-esc="record.narration"/>
+                <cbc:Note t-if="note" t-esc="note"/>
                 <cbc:DocumentCurrencyCode t-esc="record.currency_id.name"/>
                 <cbc:BuyerReference t-esc="record.commercial_partner_id.name"/>
                 <cac:OrderReference t-if="record.invoice_origin">
diff --git a/addons/account_edi_ubl/models/account_edi_format.py b/addons/account_edi_ubl/models/account_edi_format.py
index 9545a4e1c54..bf12c6b2a21 100644
--- a/addons/account_edi_ubl/models/account_edi_format.py
+++ b/addons/account_edi_ubl/models/account_edi_format.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import api, models, fields, tools, _
-from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, float_repr
+from odoo import models, fields
+from odoo.tools import float_repr, html2plaintext
 from odoo.tests.common import Form
 
 from pathlib import PureWindowsPath
@@ -195,6 +195,7 @@ class AccountEdiFormat(models.Model):
             'type_code': 380 if invoice.move_type == 'out_invoice' else 381,
             'payment_means_code': 42 if invoice.journal_id.bank_account_id else 31,
             'bank_account': invoice.partner_bank_id,
+            'note': html2plaintext(invoice.narration) if invoice.narration else False,
             'format_monetary': format_monetary,
             'customer_vals': {'partner': invoice.commercial_partner_id},
             'supplier_vals': {'partner': invoice.company_id.partner_id.commercial_partner_id},
diff --git a/addons/account_edi_ubl_bis3/data/bis3_templates.xml b/addons/account_edi_ubl_bis3/data/bis3_templates.xml
index 8f9d4214e2a..ad7c95b9d8b 100644
--- a/addons/account_edi_ubl_bis3/data/bis3_templates.xml
+++ b/addons/account_edi_ubl_bis3/data/bis3_templates.xml
@@ -115,7 +115,7 @@
                 <cbc:IssueDate t-esc="record.invoice_date"/>
                 <cbc:DueDate t-esc="record.invoice_date_due"/>
                 <cbc:InvoiceTypeCode t-esc="type_code"/>
-                <cbc:Note t-esc="record.narration"/>
+                <cbc:Note t-if="note" t-esc="note"/>
                 <cbc:DocumentCurrencyCode t-esc="record.currency_id.name"/>
                 <cbc:TaxCurrencyCode t-if="record.currency_id != record.company_currency_id"
                                      t-esc="record.company_currency_id.name"/>
diff --git a/addons/l10n_be_edi/tests/test_ubl.py b/addons/l10n_be_edi/tests/test_ubl.py
index 10bf8161b95..e62988da8a4 100644
--- a/addons/l10n_be_edi/tests/test_ubl.py
+++ b/addons/l10n_be_edi/tests/test_ubl.py
@@ -76,7 +76,6 @@ class TestL10nBeEdi(AccountEdiTestCommon):
                 <ID>INV/2017/00001</ID>
                 <IssueDate>2017-01-01</IssueDate>
                 <InvoiceTypeCode>380</InvoiceTypeCode>
-                <Note></Note>
                 <DocumentCurrencyCode>Gol</DocumentCurrencyCode>
                 <AccountingSupplierParty>
                     <Party>