diff --git a/rma_sale/wizards/rma_add_sale.py b/rma_sale/wizards/rma_add_sale.py
index d9f3ec4d5..a1d034298 100644
--- a/rma_sale/wizards/rma_add_sale.py
+++ b/rma_sale/wizards/rma_add_sale.py
@@ -129,8 +129,8 @@ def _prepare_rma_line_from_sale_order_line(self, line, lot=None):
             "uom_id": line.product_uom.id,
             "operation_id": operation.id,
             "product_qty": product_qty,
-            "delivery_address_id": self.sale_id.partner_id.id,
-            "invoice_address_id": self.sale_id.partner_id.id,
+            "delivery_address_id": self.sale_id.partner_shipping_id.id,
+            "invoice_address_id": self.sale_id.partner_invoice_id.id,
             "price_unit": line.currency_id._convert(
                 line.price_unit,
                 line.currency_id,