diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 1cc4cb750db..71a58e7f836 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -1051,12 +1051,16 @@ def get_batch_based_item_price(params, item_code) -> float:
 	if not item_price:
 		item_price = get_item_price(params, item_code, ignore_party=True, force_batch_no=True)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	if item_price and item_price[0][2] == params.get("uom"):
 		return item_price[0][1]
 =======
+=======
+	is_free_item = pctx.get('items', [{}])[0].get('is_free_item')
+>>>>>>> 1a56b83054 (fix: Batch Price gets updated only if it is a billed item)
 
-	if item_price and item_price[0].uom == pctx.uom and params.get("is_free_item") == 0:
+	if item_price and item_price[0].uom == pctx.uom and not is_free_item:
 		return item_price[0].price_list_rate
 >>>>>>> 9597b1a69e (fix: Batch Price gets updated only if it is a billed item)