diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index a39a4ddf13a..630c6609c7b 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -61,7 +61,7 @@ erpnext.buying = {
 							return erpnext.queries.company_address_query(this.frm.doc);
 						}
 
-						return erpnext.queries.supplier_address_query(this.frm.doc);
+						return erpnext.queries.supplier_address_query(this.frm);
 					});
 				}
 			}
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index cfc602acf00..801a78dad6a 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -112,12 +112,12 @@ $.extend(erpnext.queries, {
 		};
 	},
 
-	supplier_address_query: function (doc) {
-		if (!doc.supplier) {
-			cur_frm.scroll_to_field("supplier");
+	supplier_address_query: function (frm) {
+		if (!frm.doc.supplier) {
+			frm.scroll_to_field("supplier");
 			frappe.show_alert({
 				message: __("Please set {0} first.", [
-					__(frappe.meta.get_label(doc.doctype, "supplier", doc.name)),
+					__(frappe.meta.get_label(frm.doc.doctype, "supplier", frm.doc.name)),
 				]),
 				indicator: "orange",
 			});
@@ -125,7 +125,7 @@ $.extend(erpnext.queries, {
 
 		return {
 			query: "frappe.contacts.doctype.address.address.address_query",
-			filters: { link_doctype: "Supplier", link_name: doc.supplier },
+			filters: { link_doctype: "Supplier", link_name: frm.doc.supplier },
 		};
 	},