diff --git a/db/routines/hedera/procedures/order_confirmWithUser.sql b/db/routines/hedera/procedures/order_confirmWithUser.sql
index fe0f33b3f..c48b74dd7 100644
--- a/db/routines/hedera/procedures/order_confirmWithUser.sql
+++ b/db/routines/hedera/procedures/order_confirmWithUser.sql
@@ -162,6 +162,8 @@ BEGIN
 					FROM tTicketByItemPackingType;
 
 				CASE
+					WHEN NOT vCountDistinctItemPackingTypeFk THEN
+						-- Code
 					WHEN vCountDistinctItemPackingTypeFk = 1 THEN
 						INSERT INTO tTicketByItemPackingType
 							SET itemPackingTypeFk = vItemPackingTypeFk,
@@ -196,6 +198,7 @@ BEGIN
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN item i ON i.id = s.itemFk
 						WHERE t.shipped = vShipment
+							AND t.warehouseFk= vWarehouseFk
 					GROUP BY t.id
 					HAVING hasSameItemPackingType
 			)