diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py
index 930cbe05ff3..44f6942c943 100644
--- a/addons/stock/models/stock_warehouse.py
+++ b/addons/stock/models/stock_warehouse.py
@@ -132,10 +132,6 @@ class Warehouse(models.Model):
 
         Route = self.env['stock.location.route']
         warehouses = self.with_context(active_test=False)
-
-        if vals.get('code') or vals.get('name'):
-            warehouses._update_name_and_code(vals.get('name'), vals.get('code'))
-
         warehouses._create_missing_locations(vals)
 
         if vals.get('reception_steps'):
@@ -157,6 +153,9 @@ class Warehouse(models.Model):
 
         res = super(Warehouse, self).write(vals)
 
+        if vals.get('code') or vals.get('name'):
+            warehouses._update_name_and_code(vals.get('name'), vals.get('code'))
+
         for warehouse in warehouses:
             # check if we need to delete and recreate route
             depends = [depend for depends in [value.get('depends', []) for value in warehouse._get_routes_values().values()] for depend in depends]