diff --git a/addons/l10n_it_edi/data/invoice_it_simplified_template.xml b/addons/l10n_it_edi/data/invoice_it_simplified_template.xml
index 20159d135cf..2fc686bbbf3 100644
--- a/addons/l10n_it_edi/data/invoice_it_simplified_template.xml
+++ b/addons/l10n_it_edi/data/invoice_it_simplified_template.xml
@@ -23,7 +23,7 @@
                     <DatiTrasmissione>
                         <IdTrasmittente>
                             <IdPaese t-out="sender_info['country_code']"/>
-                            <IdCodice t-out="sender_info['vat']"/>
+                            <IdCodice t-out="sender_info['codice_fiscale'] or sender_info['vat']"/>
                         </IdTrasmittente>
                         <ProgressivoInvio t-out="format_alphanumeric(record.name.replace('/',''), -10)"/>
                         <FormatoTrasmissione t-out="formato_trasmissione"/>
diff --git a/addons/l10n_it_edi/tests/export_xmls/invoice_total_400_VAT_simplified.xml b/addons/l10n_it_edi/tests/export_xmls/invoice_total_400_VAT_simplified.xml
index 297d0337491..228ee870c31 100644
--- a/addons/l10n_it_edi/tests/export_xmls/invoice_total_400_VAT_simplified.xml
+++ b/addons/l10n_it_edi/tests/export_xmls/invoice_total_400_VAT_simplified.xml
@@ -5,7 +5,7 @@
         <DatiTrasmissione>
             <IdTrasmittente>
                 <IdPaese>IT</IdPaese>
-                <IdCodice>01234560157</IdCodice>
+                <IdCodice>07149930583</IdCodice>
             </IdTrasmittente>
             <ProgressivoInvio>V202200001</ProgressivoInvio>
             <FormatoTrasmissione>FSM10</FormatoTrasmissione>
@@ -16,7 +16,7 @@
                 <IdPaese>IT</IdPaese>
                 <IdCodice>01234560157</IdCodice>
             </IdFiscaleIVA>
-            <CodiceFiscale>01234560157</CodiceFiscale>
+            <CodiceFiscale>07149930583</CodiceFiscale>
             <Denominazione>company_2_data</Denominazione>
             <Sede>
                 <Indirizzo>1234 Test Street</Indirizzo>
diff --git a/addons/l10n_it_edi/tests/test_edi_export.py b/addons/l10n_it_edi/tests/test_edi_export.py
index 2ce353caebb..50791942423 100644
--- a/addons/l10n_it_edi/tests/test_edi_export.py
+++ b/addons/l10n_it_edi/tests/test_edi_export.py
@@ -179,6 +179,7 @@ class TestItEdiExport(TestItEdi):
         self._assert_export_invoice(invoice, 'invoice_below_400_codice_simplified.xml')
 
     def test_invoice_total_400_VAT_simplified(self):
+        self.company.l10n_it_codice_fiscale = '07149930583'
         invoice = self.env['account.move'].with_company(self.company).create({
             'move_type': 'out_invoice',
             'invoice_date': '2022-03-24',