diff --git a/l10n_it_account_stamp/models/account_move.py b/l10n_it_account_stamp/models/account_move.py
index 4e1a9baab51..e7936d11df9 100644
--- a/l10n_it_account_stamp/models/account_move.py
+++ b/l10n_it_account_stamp/models/account_move.py
@@ -15,9 +15,9 @@ class AccountMove(models.Model):
         compute="_compute_l10n_it_account_stamp_is_stamp_duty_applied",
         store=True,
     )
-    l10n_it_account_stamp_is_stamp_duty_present = fields.Boolean(
+    l10n_it_account_stamp_is_stamp_duty_invoice_line_present = fields.Boolean(
         string="Stamp line is present in invoice",
-        compute="_compute_l10n_it_account_stamp_is_stamp_duty_present",
+        compute="_compute_l10n_it_account_stamp_is_stamp_duty_invoice_line_present",
     )
     l10n_it_account_stamp_auto_compute_stamp_duty = fields.Boolean(
         related="company_id.l10n_it_account_stamp_stamp_duty_product_id.l10n_it_account_stamp_auto_compute",
@@ -94,7 +94,6 @@ def add_stamp_duty_line(self):
             invoice_line_vals = {
                 "move_id": inv.id,
                 "product_id": stamp_product_id.id,
-                "is_stamp_line": True,
                 "name": stamp_product_id.description_sale,
                 "sequence": 99999,
                 "account_id": stamp_account.id,
@@ -118,9 +117,9 @@ def is_stamp_duty_line_present(self):
         "invoice_line_ids.product_id",
         "invoice_line_ids.product_id.l10n_it_account_stamp_is_stamp",
     )
-    def _compute_l10n_it_account_stamp_is_stamp_duty_present(self):
+    def _compute_l10n_it_account_stamp_is_stamp_duty_invoice_line_present(self):
         for invoice in self:
-            invoice.l10n_it_account_stamp_is_stamp_duty_present = (
+            invoice.l10n_it_account_stamp_is_stamp_duty_invoice_line_present = (
                 invoice.is_stamp_duty_product_present()
             )
 
diff --git a/l10n_it_account_stamp/tests/test_account_stamp_invoicing.py b/l10n_it_account_stamp/tests/test_account_stamp_invoicing.py
index a50544bcb75..36048e6c70f 100644
--- a/l10n_it_account_stamp/tests/test_account_stamp_invoicing.py
+++ b/l10n_it_account_stamp/tests/test_account_stamp_invoicing.py
@@ -108,28 +108,25 @@ def test_amount_total_changing_currency(self):
         invoice.action_post()
         self.assertEqual(total, invoice.amount_total)
 
-    def test_stamp_duty_line_button(self):
-        """Stamp fields show when stamp is added with the button to the invoice."""
-        # Arrange: Create an invoice eligible for stamp duty but without it
-        stamp_tax = self.tax_id
-        invoice = self.init_invoice(
-            "out_invoice",
-            taxes=stamp_tax,
-            amounts=[
-                100,
-            ],
+    def test_reset_invoice_to_draft(self):
+        """Reset an invoice to draft and check that relative tax stamp accounting lines
+        has been deleted."""
+        invoice = first(
+            self.invoices.filtered(lambda inv: inv.move_type == "out_invoice")
         )
-        # pre-condition
-        self.assertTrue(invoice.l10n_it_account_stamp_is_stamp_duty_applied)
-        self.assertFalse(invoice.l10n_it_account_stamp_is_stamp_duty_present)
 
-        # Act
-        invoice.add_stamp_duty_line()
+        self.assertEqual(len(invoice), 1)
+        self.assertEqual(len(invoice.invoice_line_ids), 2)
+
+        invoice.invoice_line_ids[0].write({"tax_ids": [(6, 0, [self.tax_id.id])]})
         invoice.action_post()
 
-        # Assert
-        self.assertTrue(invoice.l10n_it_account_stamp_is_stamp_duty_present)
+        self.assertEqual(
+            len(invoice.line_ids.filtered(lambda line: line.is_stamp_line)), 2
+        )
 
-        # Resetting to draft removes the stamp
         invoice.button_draft()
-        self.assertFalse(invoice.l10n_it_account_stamp_is_stamp_duty_present)
+
+        self.assertEqual(
+            len(invoice.line_ids.filtered(lambda line: line.is_stamp_line)), 0
+        )
diff --git a/l10n_it_account_stamp/views/account_move_view.xml b/l10n_it_account_stamp/views/account_move_view.xml
index 2946386a85a..6a0b534bfef 100644
--- a/l10n_it_account_stamp/views/account_move_view.xml
+++ b/l10n_it_account_stamp/views/account_move_view.xml
@@ -34,7 +34,7 @@
                     invisible="l10n_it_account_stamp_auto_compute_stamp_duty"
                 />
                 <field
-                    name="l10n_it_account_stamp_is_stamp_duty_present"
+                    name="l10n_it_account_stamp_is_stamp_duty_invoice_line_present"
                     invisible="1"
                 />
             </xpath>
@@ -48,7 +48,9 @@
                         src="/l10n_it_account_stamp/static/description/icon.png"
                         alt="Stamp Duty"
                     />
-                    <span invisible="l10n_it_account_stamp_is_stamp_duty_present">
+                    <span
+                        invisible="l10n_it_account_stamp_is_stamp_duty_invoice_line_present"
+                    >
                         <span invisible="state != 'draft'">
                             <button
                                 type="object"
@@ -60,7 +62,9 @@
                             Stamp can only be charged to customer when invoice is in draft state
                         </span>
                     </span>
-                    <span invisible="not l10n_it_account_stamp_is_stamp_duty_present">
+                    <span
+                        invisible="not l10n_it_account_stamp_is_stamp_duty_invoice_line_present"
+                    >
                         Stamp charged to customer
                     </span>
                 </div>