diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index bc60cb19265..4c5a280034c 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -651,7 +651,7 @@ class Picking(models.Model):
                                 move_ids_without_package |= move
                         else:
                             move_ids_without_package |= move
-            picking.move_ids_without_package = move_ids_without_package.filtered(lambda move: move.picking_type_id == picking.picking_type_id)
+            picking.move_ids_without_package = move_ids_without_package.filtered(lambda move: not move.scrap_ids)
 
     def _set_move_without_package(self):
         self.move_lines |= self.move_ids_without_package