diff --git a/frappe/email/doctype/contact/contact.js b/frappe/email/doctype/contact/contact.js
index 0c7ef40f2b..c24ffef2c1 100644
--- a/frappe/email/doctype/contact/contact.js
+++ b/frappe/email/doctype/contact/contact.js
@@ -33,8 +33,8 @@ frappe.ui.form.on("Contact", {
 			return {
 				query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes",
 				filters: {
-					fieldtype: "Link",
-					options: frm.doc.doctype,
+					fieldtype: "HTML",
+					fieldname: "contact_html",
 				}
 			}
 		});
diff --git a/frappe/geo/doctype/address/address.js b/frappe/geo/doctype/address/address.js
index 41691e03fe..96388d11a3 100644
--- a/frappe/geo/doctype/address/address.js
+++ b/frappe/geo/doctype/address/address.js
@@ -17,8 +17,8 @@ frappe.ui.form.on("Address", {
 			return {
 				query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes",
 				filters: {
-					fieldtype: "Link",
-					options: frm.doc.doctype,
+					fieldtype: "HTML",
+					fieldname: "address_html",
 				}
 			}
 		});