diff --git a/repair_sale_order/models/repair_order.py b/repair_sale_order/models/repair_order.py
index 0695ac13..b0fa5c99 100644
--- a/repair_sale_order/models/repair_order.py
+++ b/repair_sale_order/models/repair_order.py
@@ -65,6 +65,12 @@ def action_create_sale_order(self):
             sale_order = order_model.create(sale_order_data)
             orders |= sale_order
             self.onchange_partner_id()
+            partner_shipping_id = False
+            if sale_order.partner_shipping_id != sale_order.partner_id:
+                partner_shipping_id = sale_order.partner_shipping_id
+            sale_order.onchange_partner_id()
+            if partner_shipping_id:
+                sale_order.partner_shipping_id = partner_shipping_id
             for line in rec.operations:
                 sale_order_line = order_line_model.create(
                     line._get_sale_line_data(sale_order)