diff --git a/stock_request_direction/models/stock_request.py b/stock_request_direction/models/stock_request.py
index 03a0611ed..8c150edb5 100644
--- a/stock_request_direction/models/stock_request.py
+++ b/stock_request_direction/models/stock_request.py
@@ -17,8 +17,8 @@ class StockRequest(models.Model):
     @api.onchange("direction")
     def _onchange_location_id(self):
         if self.direction == "outbound":
-            # Partner Locations/Customers
-            self.location_id = self.env.ref("stock.stock_location_customers")
+            # Stock Location set to Partner Locations/Customers
+            self.location_id = self.company_id.partner_id.property_stock_customer.id
         else:
             # Otherwise the Stock Location of the Warehouse
             self.location_id = self.warehouse_id.lot_stock_id.id
diff --git a/stock_request_direction/models/stock_request_order.py b/stock_request_direction/models/stock_request_order.py
index 29e719c76..e794e6058 100644
--- a/stock_request_direction/models/stock_request_order.py
+++ b/stock_request_direction/models/stock_request_order.py
@@ -14,7 +14,7 @@ class StockRequestOrder(models.Model):
         readonly=True,
     )
 
-    @api.onchange("direction")
+    @api.onchange("warehouse_id", "direction")
     def _onchange_location_id(self):
         if self.direction == "outbound":
             # Stock Location set to Partner Locations/Customers
@@ -22,6 +22,14 @@ class StockRequestOrder(models.Model):
         else:
             # Otherwise the Stock Location of the Warehouse
             self.location_id = self.warehouse_id.lot_stock_id.id
+        for stock_request in self.stock_request_ids:
+            if stock_request.route_id:
+                stock_request.route_id = False
+
+    @api.onchange("warehouse_id")
+    def onchange_warehouse_id(self):
+        # Onchange no longer needed
+        pass
 
     def change_childs(self):
         super().change_childs()