diff --git a/addons/account_edi_ubl_cii/data/ubl_20_templates.xml b/addons/account_edi_ubl_cii/data/ubl_20_templates.xml
index 61c96f38743..9746255c6f6 100644
--- a/addons/account_edi_ubl_cii/data/ubl_20_templates.xml
+++ b/addons/account_edi_ubl_cii/data/ubl_20_templates.xml
@@ -277,6 +277,9 @@
             <cbc:DocumentCurrencyCode
                     t-att="vals.get('document_currency_code_attrs', {})"
                     t-out="invoice.currency_id.name.upper()"/>
+            <cbc:TaxCurrencyCode
+                    t-att="vals.get('tax_currency_code_attrs', {})"
+                    t-out="vals.get('tax_currency_code')"/>
             <t t-foreach="vals.get('invoice_period_vals_list', [])" t-as="foreach_vals">
                 <cac:InvoicePeriod>
                     <cbc:StartDate t-out="foreach_vals.get('start_date')"/>
diff --git a/addons/account_edi_ubl_cii/data/ubl_21_templates.xml b/addons/account_edi_ubl_cii/data/ubl_21_templates.xml
index 9df763282e5..9ba807c8863 100644
--- a/addons/account_edi_ubl_cii/data/ubl_21_templates.xml
+++ b/addons/account_edi_ubl_cii/data/ubl_21_templates.xml
@@ -38,7 +38,7 @@
                     t-out="vals.get('credit_note_type_code')"
             />
         </xpath>
-        <xpath expr="//*[local-name()='DocumentCurrencyCode']" position="after">
+        <xpath expr="//*[local-name()='TaxCurrencyCode']" position="after">
             <cbc:BuyerReference
                     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
diff --git a/addons/l10n_sa_edi/data/ubl_21_zatca.xml b/addons/l10n_sa_edi/data/ubl_21_zatca.xml
index 2ab7ef4076b..7d883936895 100644
--- a/addons/l10n_sa_edi/data/ubl_21_zatca.xml
+++ b/addons/l10n_sa_edi/data/ubl_21_zatca.xml
@@ -240,13 +240,6 @@
                 </t>
             </xpath>
 
-            <!-- Add Tax Currency Code in compliance with rules BR-KSA-EN16931-02 and BR-KSA-68 -->
-            <xpath expr="//*[local-name()='DocumentCurrencyCode']" position="after">
-                <cbc:TaxCurrencyCode xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                                     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
-                                     t-esc="invoice.company_currency_id.name"/>
-            </xpath>
-
             <!-- Add Previous Invoice Hash & Invoice Counter Value -->
             <xpath expr="//*[local-name()='BillingReference']" position="after">
                 <t xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
diff --git a/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py b/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py
index a87d60071e8..2b680ba1c39 100644
--- a/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py
+++ b/addons/l10n_sa_edi/models/account_edi_xml_ubl_21_zatca.py
@@ -259,6 +259,7 @@ class AccountEdiXmlUBL21Zatca(models.AbstractModel):
             'profile_id': 'reporting:1.0',
             'invoice_type_code_attrs': {'name': self._l10n_sa_get_invoice_transaction_code(invoice)},
             'invoice_type_code': self._l10n_sa_get_invoice_type(invoice),
+            'tax_currency_code': invoice.company_currency_id.name,
             'issue_date': fields.Datetime.context_timestamp(self.with_context(tz='Asia/Riyadh'),
                                                             invoice.l10n_sa_confirmation_datetime),
             'previous_invoice_hash': self._l10n_sa_get_previous_invoice_hash(invoice),