diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index c592d31f4dd..ff87d159e36 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -221,7 +221,7 @@ def update_stock(ctx, out, doc=None):
 				else:
 					qty -= batch_qty
 
-				out.update({"batch_no": batch_no, "actual_batch_qty": qty})
+				out.update({"batch_no": batch_no, "actual_batch_qty": batch_qty})
 				if rate:
 					out.update({"rate": rate, "price_list_rate": rate})
 
@@ -1051,9 +1051,11 @@ 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)
 
-	is_free_item = params.get("items", [{}])[0].get("is_free_item")
-
-	if item_price and item_price[0][2] == params.get("uom") and not is_free_item:
+	if (
+		item_price
+		and item_price[0][2] == params.get("uom")
+		and not params.get("items", [{}])[0].get("is_free_item", 0)
+	):
 		return item_price[0][1]
 
 	return 0.0