diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index be29fe890514ebee9c4d297ede8b2f4bf62ae9c8..1a28f385b6a5213a21daf591840d7e4568e60366 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -106,6 +106,8 @@ class StockPicking(models.Model):
         for picking in self:
             if picking.carrier_id:
                 picking.return_label_ids = self.env['ir.attachment'].search([('res_model', '=', 'stock.picking'), ('res_id', '=', picking.id), ('name', 'like', '%s%%' % picking.carrier_id.get_return_label_prefix())])
+            else:
+                picking.return_label_ids = False
 
     @api.depends('move_lines')
     def _cal_weight(self):