diff --git a/addons/l10n_it_edi/data/invoice_it_template.xml b/addons/l10n_it_edi/data/invoice_it_template.xml
index 2582c8b2aad..cb07e0c58c6 100644
--- a/addons/l10n_it_edi/data/invoice_it_template.xml
+++ b/addons/l10n_it_edi/data/invoice_it_template.xml
@@ -119,8 +119,7 @@
                     <IdPaese t-out="buyer.country_id.code"/>
                     <IdCodice t-out="'0000000'"/>
                 </IdFiscaleIVA>
-                <CodiceFiscale t-if="not buyer.vat and buyer.l10n_it_codice_fiscale" t-out="normalize_codice_fiscale(buyer.l10n_it_codice_fiscale)"/>
-                <CodiceFiscale t-elif="not buyer.vat and not buyer.l10n_it_codice_fiscale" t-out="99999999999"/>
+                <CodiceFiscale t-if="buyer.l10n_it_codice_fiscale" t-esc="normalize_codice_fiscale(buyer.l10n_it_codice_fiscale)"/>
                 <Anagrafica>
                     <t t-if="buyer_is_company">
                         <Denominazione t-out="format_alphanumeric(buyer.display_name[:80])"/>
diff --git a/addons/l10n_it_edi/tests/common.py b/addons/l10n_it_edi/tests/common.py
index c00c378a346..d86a23de3f4 100644
--- a/addons/l10n_it_edi/tests/common.py
+++ b/addons/l10n_it_edi/tests/common.py
@@ -47,7 +47,7 @@ class TestItEdi(AccountEdiTestCommon):
         cls.italian_partner_a = cls.env['res.partner'].create({
             'name': 'Alessi',
             'vat': 'IT00465840031',
-            'l10n_it_codice_fiscale': '00465840031',
+            'l10n_it_codice_fiscale': '93026890017',
             'country_id': cls.env.ref('base.it').id,
             'street': 'Via Privata Alessi 6',
             'zip': '28887',
diff --git a/addons/l10n_it_edi/tests/expected_xmls/IT00470550013_basis.xml b/addons/l10n_it_edi/tests/expected_xmls/IT00470550013_basis.xml
index 2eea78d701a..113f4551b4b 100644
--- a/addons/l10n_it_edi/tests/expected_xmls/IT00470550013_basis.xml
+++ b/addons/l10n_it_edi/tests/expected_xmls/IT00470550013_basis.xml
@@ -36,6 +36,7 @@
           <IdPaese>IT</IdPaese>
           <IdCodice>00465840031</IdCodice>
         </IdFiscaleIVA>
+        <CodiceFiscale>93026890017</CodiceFiscale>
         <Anagrafica>
           <Denominazione>Alessi</Denominazione>
         </Anagrafica>
diff --git a/addons/l10n_it_edi/tests/expected_xmls/reverse_charge_bill.xml b/addons/l10n_it_edi/tests/expected_xmls/reverse_charge_bill.xml
index 121b425f22d..c0718372278 100644
--- a/addons/l10n_it_edi/tests/expected_xmls/reverse_charge_bill.xml
+++ b/addons/l10n_it_edi/tests/expected_xmls/reverse_charge_bill.xml
@@ -35,6 +35,7 @@
                     <IdPaese>IT</IdPaese>
                     <IdCodice>01234560157</IdCodice>
                 </IdFiscaleIVA>
+                <CodiceFiscale>01234560157</CodiceFiscale>
                 <Anagrafica>
                     <Denominazione>company_2_data</Denominazione>
                 </Anagrafica>
diff --git a/addons/l10n_it_stock_ddt/tests/expected_xmls/deferred_invoice.xml b/addons/l10n_it_stock_ddt/tests/expected_xmls/deferred_invoice.xml
index e69757fab72..f5336ecc305 100644
--- a/addons/l10n_it_stock_ddt/tests/expected_xmls/deferred_invoice.xml
+++ b/addons/l10n_it_stock_ddt/tests/expected_xmls/deferred_invoice.xml
@@ -36,6 +36,7 @@
                     <IdPaese>IT</IdPaese>
                     <IdCodice>00465840031</IdCodice>
                 </IdFiscaleIVA>
+                <CodiceFiscale>93026890017</CodiceFiscale>
                 <Anagrafica>
                     <Denominazione>Alessi</Denominazione>
                 </Anagrafica>