diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 585e9a0c798..5a8047bb8e5 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -743,6 +743,8 @@ class Picking(models.Model):
     @api.depends('picking_type_id', 'partner_id')
     def _compute_location_id(self):
         for picking in self:
+            if picking.state != 'draft':
+                continue
             picking = picking.with_company(picking.company_id)
             if picking.picking_type_id:
                 if picking.picking_type_id.default_location_src_id: