diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py
index 14bcf759..b659cae5 100644
--- a/rma_account/models/rma_order_line.py
+++ b/rma_account/models/rma_order_line.py
@@ -207,7 +207,9 @@ class RmaOrderLine(models.Model):
                 line.date,
                 round=False,
             ),
-            "delivery_address_id": line.move_id.partner_id.id,
+            "delivery_address_id": line.move_id.partner_shipping_id.id
+            if line.move_id.partner_shipping_id
+            else line.move_id.partner_id.id,
             "invoice_address_id": line.move_id.partner_id.id,
             "receipt_policy": operation.receipt_policy,
             "refund_policy": operation.refund_policy,
diff --git a/rma_account/wizards/rma_add_account_move.py b/rma_account/wizards/rma_add_account_move.py
index 1147a180..8ab574a4 100644
--- a/rma_account/wizards/rma_add_account_move.py
+++ b/rma_account/wizards/rma_add_account_move.py
@@ -89,7 +89,9 @@ class RmaAddAccountMove(models.TransientModel):
                 line.date,
                 round=False,
             ),
-            "delivery_address_id": line.move_id.partner_id.id,
+            "delivery_address_id": line.move_id.partner_shipping_id.id
+            if line.move_id.partner_shipping_id
+            else line.move_id.partner_id.id,
             "invoice_address_id": line.move_id.partner_id.id,
             "rma_id": self.rma_id.id,
             "receipt_policy": operation.receipt_policy,