diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index ef9c12b7b37..b3b37277791 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -1343,11 +1343,11 @@ def get_conversion_factor(item_code, uom):
 
 	if item.variant_of:
 		filters["parent"] = ("in", (item_code, item.variant_of))
-	conversion_factor = frappe.db.get_value("UOM Conversion Detail", filters, "conversion_factor")
+	conversion_factor = frappe.get_all("UOM Conversion Detail", filters, pluck="conversion_factor")
 	if not conversion_factor:
-		conversion_factor = get_uom_conv_factor(uom, item.stock_uom)
+		conversion_factor = [get_uom_conv_factor(uom, item.stock_uom) or 1]
 
-	return {"conversion_factor": conversion_factor or 1.0}
+	return {"conversion_factor": conversion_factor[-1]}
 
 
 @frappe.whitelist()