diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index 1e42edce..e1b47eda 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -159,6 +159,8 @@
                                     <group name="outbound" string="Outbound">
                                         <field name="out_warehouse_id"/>
                                         <field name="delivery_address_id"
+                                               domain="['|', ('parent_id', '=', partner_id),
+                                                             ('id', '=', partner_id)]"
                                                context="{'show_address': 1}"
                                                options="{'always_reload': 1}"
                                                groups='rma.group_rma_delivery_invoice_address'/>
@@ -333,6 +335,8 @@
                                 <group name="outbound" string="Outbound">
                                     <field name="out_warehouse_id"/>
                                     <field name="delivery_address_id"
+                                           domain="['|', ('parent_id', '=', partner_id),
+                                                         ('id', '=', partner_id)]"
                                            context="{'show_address': 1}"
                                            options="{'always_reload': 1}"
                                            groups='rma.group_rma_delivery_invoice_address'/>
diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index 648616d8..d228871a 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -33,6 +33,8 @@
                 </page>
                 <field name="delivery_address_id" position="after">
                     <field name="invoice_address_id"
+                           domain="['|', ('parent_id', '=', partner_id),
+                                         ('id', '=', partner_id)]"
                            groups='rma.group_rma_delivery_invoice_address'/>
                 </field>
                 <group name="deliver" position="after">
@@ -78,6 +80,8 @@
                 </page>
                 <field name="delivery_address_id" position="after">
                     <field name="invoice_address_id"
+                           domain="['|', ('parent_id', '=', partner_id),
+                                         ('id', '=', partner_id)]"
                            groups='rma.group_rma_delivery_invoice_address'/>
                 </field>
                 <group name="supplier_rma" position="after">