diff --git a/l10n_es_vat_book/data/aeat_vat_book_map_data.xml b/l10n_es_vat_book/data/aeat_vat_book_map_data.xml
index a8b927039c3..f3bd17818fa 100644
--- a/l10n_es_vat_book/data/aeat_vat_book_map_data.xml
+++ b/l10n_es_vat_book/data/aeat_vat_book_map_data.xml
@@ -6,6 +6,10 @@
         <field name="special_tax_group" eval="False" />
         <field name="fee_type_xlsx_column">N</field>
         <field name="fee_amount_xlsx_column">O</field>
+        <field
+            name="tax_agency_ids"
+            eval="[ Command.link(ref('l10n_es_aeat.aeat_tax_agency_spain')) ]"
+        />
         <field
             name="tax_tmpl_ids"
             eval="[
@@ -40,6 +44,10 @@
         <field name="special_tax_group" eval="False" />
         <field name="fee_type_xlsx_column">O</field>
         <field name="fee_amount_xlsx_column">P</field>
+        <field
+            name="tax_agency_ids"
+            eval="[ Command.link(ref('l10n_es_aeat.aeat_tax_agency_spain')) ]"
+        />
         <field name="tax_account_id" ref="l10n_es.account_common_472" />
         <field
             name="tax_tmpl_ids"
@@ -112,6 +120,10 @@
         <field name="name">IVA soportado no deducible</field>
         <field name="book_type">received</field>
         <field name="special_tax_group" eval="False" />
+        <field
+            name="tax_agency_ids"
+            eval="[ Command.link(ref('l10n_es_aeat.aeat_tax_agency_spain')) ]"
+        />
         <field
             name="tax_tmpl_ids"
             eval="[
@@ -130,6 +142,10 @@
         <field name="special_tax_group">req</field>
         <field name="fee_type_xlsx_column">P</field>
         <field name="fee_amount_xlsx_column">Q</field>
+        <field
+            name="tax_agency_ids"
+            eval="[ Command.link(ref('l10n_es_aeat.aeat_tax_agency_spain')) ]"
+        />
         <field
             name="tax_tmpl_ids"
             eval="[
@@ -147,6 +163,10 @@
         <field name="special_tax_group">req</field>
         <field name="fee_type_xlsx_column">R</field>
         <field name="fee_amount_xlsx_column">S</field>
+        <field
+            name="tax_agency_ids"
+            eval="[ Command.link(ref('l10n_es_aeat.aeat_tax_agency_spain')) ]"
+        />
         <field
             name="tax_tmpl_ids"
             eval="[
diff --git a/l10n_es_vat_book/models/aeat_vat_book_map_line.py b/l10n_es_vat_book/models/aeat_vat_book_map_line.py
index 47dd1889bfc..4783f769d78 100644
--- a/l10n_es_vat_book/models/aeat_vat_book_map_line.py
+++ b/l10n_es_vat_book/models/aeat_vat_book_map_line.py
@@ -32,6 +32,7 @@ def _selection_special_tax_group(self):
         comodel_name="account.account.template",
         string="Tax Account Restriction",
     )
+    tax_agency_ids = fields.Many2many("aeat.tax.agency", string="Tax Agency")
 
     def get_taxes(self, report):
         self.ensure_one()
diff --git a/l10n_es_vat_book/models/l10n_es_vat_book.py b/l10n_es_vat_book/models/l10n_es_vat_book.py
index c22a4994670..7a6d483cd2d 100644
--- a/l10n_es_vat_book/models/l10n_es_vat_book.py
+++ b/l10n_es_vat_book/models/l10n_es_vat_book.py
@@ -348,9 +348,12 @@ def get_pos_partner_ids(self):
 
     @ormcache("self.id")
     def get_special_taxes_dic(self):
-        map_lines = self.env["aeat.vat.book.map.line"].search(
-            [("special_tax_group", "!=", False)]
-        )
+        domain = [("special_tax_group", "!=", False)]
+        if self.tax_agency_ids:
+            domain += [
+                ("tax_agency_ids", "in", [False] + self.tax_agency_ids.ids),
+            ]
+        map_lines = self.env["aeat.vat.book.map.line"].search(domain)
         special_dic = {}
         for map_line in map_lines:
             for tax in map_line.get_taxes(self):
@@ -451,9 +454,12 @@ def _calculate_vat_book(self):
             # Searches for all possible usable lines to report
             moves = rec._get_account_move_lines()
             for book_type in ["issued", "received"]:
-                map_lines = self.env["aeat.vat.book.map.line"].search(
-                    [("book_type", "=", book_type)]
-                )
+                domain = [("book_type", "=", book_type)]
+                if rec.tax_agency_ids:
+                    domain += [
+                        ("tax_agency_ids", "in", [False] + rec.tax_agency_ids.ids),
+                    ]
+                map_lines = self.env["aeat.vat.book.map.line"].search(domain)
                 taxes = self.env["account.tax"]
                 accounts = {}
                 for map_line in map_lines:
@@ -476,7 +482,8 @@ def _calculate_vat_book(self):
                     lines = moves.filtered(
                         lambda line: (line.tax_ids | line.tax_line_id) & taxes
                     )
-                rec.create_vat_book_lines(lines, map_line.book_type, taxes)
+                if map_lines:
+                    rec.create_vat_book_lines(lines, map_lines[:1].book_type, taxes)
             # Issued
             book_type = "issued"
             issued_tax_lines = rec.issued_line_ids.mapped("tax_line_ids")
diff --git a/l10n_es_vat_book/tests/test_l10n_es_aeat_vat_book.py b/l10n_es_vat_book/tests/test_l10n_es_aeat_vat_book.py
index 8fc0f45f8e9..e11e33e4443 100644
--- a/l10n_es_vat_book/tests/test_l10n_es_aeat_vat_book.py
+++ b/l10n_es_vat_book/tests/test_l10n_es_aeat_vat_book.py
@@ -97,3 +97,15 @@ def test_model_vat_book(self):
         report_xlsx = self.env.ref(report_name)._render(vat_book.ids)
         self.assertGreaterEqual(len(report_xlsx[0]), 1)
         self.assertEqual(report_xlsx[1], "xlsx")
+        # Check empty Vat Book
+        vat_book.write(
+            {
+                "tax_agency_ids": [
+                    (4, self.env.ref("l10n_es_aeat.aeat_tax_agency_araba").id)
+                ],
+            }
+        )
+        vat_book.button_calculate()
+        self.assertEqual(len(vat_book.issued_line_ids), 0)
+        self.assertEqual(len(vat_book.rectification_issued_line_ids), 0)
+        self.assertEqual(len(vat_book.issued_tax_summary_ids), 0)
diff --git a/l10n_es_vat_book/views/aeat_vat_book_map_view.xml b/l10n_es_vat_book/views/aeat_vat_book_map_view.xml
index 698e74fa5af..7344ba205fa 100644
--- a/l10n_es_vat_book/views/aeat_vat_book_map_view.xml
+++ b/l10n_es_vat_book/views/aeat_vat_book_map_view.xml
@@ -23,6 +23,7 @@
                 <field name="fee_amount_xlsx_column" />
                 <field name="tax_tmpl_ids" widget="many2many_tags" />
                 <field name="tax_account_id" />
+                <field name="tax_agency_ids" widget="many2many_tags" />
             </tree>
         </field>
     </record>
diff --git a/l10n_es_vat_book/views/l10n_es_vat_book.xml b/l10n_es_vat_book/views/l10n_es_vat_book.xml
index 3210e816819..db378863918 100644
--- a/l10n_es_vat_book/views/l10n_es_vat_book.xml
+++ b/l10n_es_vat_book/views/l10n_es_vat_book.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <record id="view_l10n_es_vat_book_tree" model="ir.ui.view">
+        <field name="name">l10n_es.vat.book.tree</field>
+        <field name="model">l10n.es.vat.book</field>
+        <field name="inherit_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_tree" />
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <field name="period_type" position="after">
+                <field name="tax_agency_ids" widget="many2many_tags" />
+            </field>
+        </field>
+    </record>
     <record id="view_l10n_es_vat_book_form" model="ir.ui.view">
         <field name="name">l10n_es.vat.book.form</field>
         <field name="model">l10n.es.vat.book</field>
@@ -44,6 +55,7 @@
             </field>
             <group name="group_other_parameters" position="inside">
                 <field name="auto_renumber" />
+                <field name="tax_agency_ids" widget="many2many_tags" />
             </group>
             <xpath expr="//group[@name='group_declaration']" position="after">
                 <notebook>
@@ -96,7 +108,7 @@
     <record model="ir.actions.act_window.view" id="action_l10n_vat_book_report_tree">
         <field name="sequence" eval="2" />
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="l10n_es_aeat.view_l10n_es_aeat_report_tree" />
+        <field name="view_id" ref="view_l10n_es_vat_book_tree" />
         <field name="act_window_id" ref="l10n_es_vat_book_action" />
     </record>
     <record model="ir.actions.act_window.view" id="action_l10n_vat_book_report_form">