diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index ba1e5348847..c8a61a0ca79 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -171,15 +171,13 @@ erpnext.buying = {
 						shipping_address: this.frm.doc.shipping_address
 					},
 					callback: (r) => {
-						if (!this.frm.doc.billing_address)
-							this.frm.set_value("billing_address", r.message.primary_address || "");
+						if (!r.message) return;
 
-						if (
-							!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address") ||
-							this.frm.doc.shipping_address
-						)
-							return;
-						this.frm.set_value("shipping_address", r.message.shipping_address || "");
+						this.frm.set_value("billing_address", r.message.primary_address || "");
+
+						if (frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) {
+							this.frm.set_value("shipping_address", r.message.shipping_address || "");
+						}
 					},
 				});
 				erpnext.utils.set_letter_head(this.frm)