diff --git a/db/routines/vn/procedures/itemShelving_add.sql b/db/routines/vn/procedures/itemShelving_add.sql
index d4c31f09e..0bec9fb45 100644
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@@ -20,8 +20,11 @@ BEGIN
 
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	
-	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
-	SET vQuantity = vQuantity * vPacking;
+	IF vPacking IS NULL
+	THEN 
+		SET vPacking = itemPacking(vBarcode, vWarehouseFk);
+		SET vQuantity = vQuantity * vPacking;
+	END IF;
 
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN