diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 11596d7058..f1c3535824 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -224,7 +224,7 @@ def add_data_to_custom_columns(columns, result):
 				fieldname = column['fieldname']
 				key = (column['doctype'], fieldname)
 				link_field = column['link_field']
-				row[fieldname] = custom_fields_data.get(key, {}).get(row[link_field])
+				row[fieldname] = custom_fields_data.get(key, {}).get(row.get(link_field))
 
 	return data
 
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 92319f8e3a..a121310c97 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1014,6 +1014,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 								label: df.label,
 								link_field: this.doctype_field_map[values.doctype],
 								doctype: values.doctype,
+								options: df.fieldtype === "Link" ? values.doctype : undefined,
 								width: 100
 							});