diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 33819a842b0..3e298afe658 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -177,7 +177,10 @@ erpnext.buying = {
 						this.frm.set_value("billing_address", r.message.primary_address || "");
 
 						if (!frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) return;
-						this.frm.set_value("shipping_address", r.message.shipping_address || "");
+						this.frm.set_value(
+							"shipping_address",
+							r.message.shipping_address || this.frm.doc.shipping_address || ""
+						);
 					},
 				});
 				erpnext.utils.set_letter_head(this.frm);