diff --git a/modules/purchase_amendment/purchase.py b/modules/purchase_amendment/purchase.py
index cae58157f7..9d4cbea2e0 100644
--- a/modules/purchase_amendment/purchase.py
+++ b/modules/purchase_amendment/purchase.py
@@ -376,7 +376,7 @@ class AmendmentLine(ModelSQL, ModelView):
             self.product = self.product_supplier = self.description = None
             self.quantity = self.unit = self.unit_price = None
 
-    @fields.depends('party', 'invoice_party')
+    @fields.depends('party', 'invoice_party', 'invoice_address')
     def on_change_party(self):
         if not self.invoice_party:
             self.invoice_address = None
diff --git a/modules/sale_amendment/sale.py b/modules/sale_amendment/sale.py
index 82d304f0ee..cd5da2526f 100644
--- a/modules/sale_amendment/sale.py
+++ b/modules/sale_amendment/sale.py
@@ -399,7 +399,9 @@ class AmendmentLine(ModelSQL, ModelView):
             self.product = self.quantity = self.unit = self.unit_price = None
             self.description = None
 
-    @fields.depends('party', 'invoice_party', 'shipment_party', 'warehouse')
+    @fields.depends(
+        'party', 'invoice_party', 'invoice_address',
+        'shipment_party', 'warehouse')
     def on_change_party(self):
         if not self.invoice_party:
             self.invoice_address = None