diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 917f17e9950..044e5b8d85b 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -488,7 +488,8 @@ class AccountInvoice(models.Model):
             else:
                 account_id = pay_account.id
                 payment_term_id = p.property_supplier_payment_term_id.id
-            fiscal_position = p.property_account_position_id.id
+            addr = p.address_get(['delivery'])
+            fiscal_position = self.env['account.fiscal.position'].get_fiscal_position(p.id, delivery_id=addr['delivery'])
 
         self.account_id = account_id
         self.payment_term_id = payment_term_id