diff --git a/rma_account/wizards/rma_refund.py b/rma_account/wizards/rma_refund.py
index c03d3895b..296299867 100644
--- a/rma_account/wizards/rma_refund.py
+++ b/rma_account/wizards/rma_refund.py
@@ -167,12 +167,13 @@ def _prepare_refund(self, wizard, rma_line):
             "ref": ref,
             "move_type": "in_refund" if rma_line.type == "supplier" else "out_refund",
             "journal_id": journal.id,
-            "fiscal_position_id": rma_line.partner_id.property_account_position_id.id,
             "state": "draft",
             "currency_id": self._get_refund_currency(rma_line).id,
             "date": wizard.date,
             "invoice_date": wizard.date_invoice,
             "partner_id": rma_line.invoice_address_id.id or rma_line.partner_id.id,
+            "partner_shipping_id": rma_line.delivery_address_id.id
+            or rma_line.partner_id.id,
             "invoice_line_ids": [
                 (0, None, self.prepare_refund_line(item)) for item in self.item_ids
             ],