diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index d83bfc6d1f3..5b0ba5e629e 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -404,7 +404,7 @@ erpnext.patches.v14_0.disable_add_row_in_gross_profit
 erpnext.patches.v14_0.update_posting_datetime
 erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference
 erpnext.patches.v15_0.recalculate_amount_difference_field
-erpnext.patches.v15_0.rename_sla_fields
+erpnext.patches.v15_0.rename_sla_fields #2025-03-12
 erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
 erpnext.patches.v15_0.update_query_report
 erpnext.patches.v15_0.set_purchase_receipt_row_item_to_capitalization_stock_item
diff --git a/erpnext/patches/v15_0/rename_sla_fields.py b/erpnext/patches/v15_0/rename_sla_fields.py
index 0c6d3560b8b..1f4fc1be311 100644
--- a/erpnext/patches/v15_0/rename_sla_fields.py
+++ b/erpnext/patches/v15_0/rename_sla_fields.py
@@ -4,15 +4,19 @@ from frappe.model.utils.rename_field import rename_field
 
 
 def execute():
-	doctypes = list(set(frappe.get_all("Service Level Agreement", pluck="document_type")))
+	doctypes = frappe.get_all("Service Level Agreement", pluck="document_type", distinct=True)
 	for doctype in doctypes:
 		if doctype == "Issue":
 			continue
 
-		if frappe.db.exists("Custom Field", {"name": doctype + "-resolution_by"}):
+		if frappe.db.exists(
+			"Custom Field", {"name": doctype + "-resolution_by", "fieldname": "resolution_by"}
+		):
 			rename_fieldname(doctype + "-resolution_by", "sla_resolution_by")
 
-		if frappe.db.exists("Custom Field", {"name": doctype + "-resolution_date"}):
+		if frappe.db.exists(
+			"Custom Field", {"name": doctype + "-resolution_date", "fieldname": "resolution_date"}
+		):
 			rename_fieldname(doctype + "-resolution_date", "sla_resolution_date")
 
 	rename_field("Issue", "resolution_by", "sla_resolution_by")