diff --git a/erpnext/public/js/address.js b/erpnext/public/js/address.js
index 1176075b39..57f7163bbb 100644
--- a/erpnext/public/js/address.js
+++ b/erpnext/public/js/address.js
@@ -3,24 +3,23 @@
 
 frappe.ui.form.on("Address", {
 	is_your_company_address: function(frm) {
-		if(frm.doc.is_your_company_address){
+		frm.clear_table('links');
+		if(frm.doc.is_your_company_address) {
 			frm.add_child('links', {
 				link_doctype: 'Company',
 				link_name: frappe.defaults.get_user_default('Company')
 			});
-			frm.fields_dict.links.grid.get_field('link_doctype').get_query = function() {
+			frm.set_query('link_doctype', 'links', () => {
 				return {
 					filters: {
 						name: 'Company'
 					}
 				};
-			};
+			});
 			frm.refresh_field('links');
 		}
-		else{
-			frm.fields_dict.links.grid.get_field('link_doctype').get_query = null;
-			frm.clear_table('links');
+		else {
+			frm.trigger('refresh');
 		}
-		frm.refresh_field('links');
 	}
 });