diff --git a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
index 2b5b1f7..0a576d6 100644
--- a/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
+++ b/erpnext/loan_management/doctype/loan_balance_adjustment/loan_balance_adjustment.py
@@ -42,9 +42,10 @@
 			self.cost_center = erpnext.get_default_cost_center(self.company)
 
 	def set_status_and_amounts(self, cancel=0):
-		loan_details = frappe.get_all(
+		loan_details = frappe.db.get_value(
 			"Loan",
-			fields=[
+			self.loan,
+			[
 				"loan_amount",
 				"credit_adjustment_amount",
 				"debit_adjustment_amount",
@@ -55,8 +56,8 @@
 				"is_term_loan",
 				"is_secured_loan",
 			],
-			filters={"name": self.loan},
-		)[0]
+			as_dict=1,
+		)
 
 		if cancel:
 			adjustment_amount = self.get_values_on_cancel(loan_details)
diff --git a/erpnext/loan_management/doctype/loan_refund/loan_refund.py b/erpnext/loan_management/doctype/loan_refund/loan_refund.py
index 903494c..265c969 100644
--- a/erpnext/loan_management/doctype/loan_refund/loan_refund.py
+++ b/erpnext/loan_management/doctype/loan_refund/loan_refund.py
@@ -3,11 +3,11 @@
 
 import frappe
 from frappe import _
-from erpnext.controllers.accounts_controller import AccountsController
-from frappe.utils import cint, getdate
+from frappe.utils import getdate
 
 import erpnext
 from erpnext.accounts.general_ledger import make_gl_entries
+from erpnext.controllers.accounts_controller import AccountsController
 from erpnext.loan_management.doctype.loan_repayment.loan_repayment import (
 	get_pending_principal_amount,
 )
@@ -27,13 +27,6 @@
 			self.cost_center = erpnext.get_default_cost_center(self.company)
 
 	def validate_refund_amount(self):
-		precision = cint(frappe.db.get_default("currency_precision")) or 2
-		total_payment, principal_paid, interest_payable, written_off_amount = frappe.get_value(
-			"Loan",
-			self.loan,
-			["total_payment", "total_principal_paid", "total_interest_payable", "written_off_amount"],
-		)
-
 		loan = frappe.get_doc("Loan", self.loan)
 		pending_amount = get_pending_principal_amount(loan)
 		if pending_amount >= 0:
