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 e6482eef052..2cadd82f034 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
@@ -104,7 +104,11 @@ class AccountEdiXmlUBL21Zatca(models.AbstractModel):
         """ Override to include/update values specific to ZATCA's UBL 2.1 specs """
         return [{
             'id_attrs': {'schemeID': partner.l10n_sa_additional_identification_scheme},
-            'id': partner.l10n_sa_additional_identification_number if partner.l10n_sa_additional_identification_scheme != 'TIN' else partner.vat
+            'id': (
+                partner.l10n_sa_additional_identification_number
+                if partner.l10n_sa_additional_identification_scheme != 'TIN' and partner.country_code == 'SA'
+                else partner.vat
+            ),
         }]
 
     def _l10n_sa_get_payment_means_code(self, invoice):
diff --git a/addons/l10n_sa_edi/tests/compliance/standard/credit.xml b/addons/l10n_sa_edi/tests/compliance/standard/credit.xml
index dc3da47e48e..f5447b9b7f3 100644
--- a/addons/l10n_sa_edi/tests/compliance/standard/credit.xml
+++ b/addons/l10n_sa_edi/tests/compliance/standard/credit.xml
@@ -102,9 +102,6 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cac:PartyIdentification>
-                <cbc:ID schemeID="CRN">353535353535353</cbc:ID>
-            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>Chichi Lboukla</cbc:Name>
             </cac:PartyName>
diff --git a/addons/l10n_sa_edi/tests/compliance/standard/debit.xml b/addons/l10n_sa_edi/tests/compliance/standard/debit.xml
index 690cedce8c0..ee4cc740125 100644
--- a/addons/l10n_sa_edi/tests/compliance/standard/debit.xml
+++ b/addons/l10n_sa_edi/tests/compliance/standard/debit.xml
@@ -102,9 +102,6 @@
     </cac:AccountingSupplierParty>
     <cac:AccountingCustomerParty>
         <cac:Party>
-            <cac:PartyIdentification>
-                <cbc:ID schemeID="CRN">353535353535353</cbc:ID>
-            </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>Chichi Lboukla</cbc:Name>
             </cac:PartyName>
diff --git a/addons/l10n_sa_edi/tests/compliance/standard/invoice.xml b/addons/l10n_sa_edi/tests/compliance/standard/invoice.xml
index a8cefd0386f..f1c4d6c77be 100644
--- a/addons/l10n_sa_edi/tests/compliance/standard/invoice.xml
+++ b/addons/l10n_sa_edi/tests/compliance/standard/invoice.xml
@@ -97,7 +97,7 @@
     <cac:AccountingCustomerParty>
         <cac:Party>
             <cac:PartyIdentification>
-                <cbc:ID schemeID="CRN">353535353535353</cbc:ID>
+                <cbc:ID schemeID="CRN">US12345677</cbc:ID>
             </cac:PartyIdentification>
             <cac:PartyName>
                 <cbc:Name>Chichi Lboukla</cbc:Name>
@@ -118,6 +118,7 @@
             </cac:PostalAddress>
             <cac:PartyLegalEntity>
                 <cbc:RegistrationName>Chichi Lboukla</cbc:RegistrationName>
+                <cbc:CompanyID>US12345677</cbc:CompanyID>
                 <cac:RegistrationAddress>
                     <cbc:StreetName>4557 De Silva St</cbc:StreetName>
                     <cbc:BuildingNumber>12300</cbc:BuildingNumber>
diff --git a/addons/l10n_sa_edi/tests/test_edi_zatca.py b/addons/l10n_sa_edi/tests/test_edi_zatca.py
index fc79a3c7e2d..ec5885da31e 100644
--- a/addons/l10n_sa_edi/tests/test_edi_zatca.py
+++ b/addons/l10n_sa_edi/tests/test_edi_zatca.py
@@ -22,6 +22,7 @@ class TestEdiZatca(TestSaEdiCommon):
             expected_tree = self.get_xml_tree_from_string(standard_invoice)
             expected_tree = self.with_applied_xpath(expected_tree, self.invoice_applied_xpath)
 
+            self.partner_us.vat = 'US12345677'
             move = self._create_invoice(name='INV/2022/00014', date='2022-09-05', date_due='2022-09-22', partner_id=self.partner_us,
                                         product_id=self.product_a, price=320.0)
             move._l10n_sa_generate_unsigned_data()