diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 1afca307d94..8c0be8042ac 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -171,13 +171,15 @@ erpnext.buying = {
 						shipping_address: this.frm.doc.shipping_address
 					},
 					callback: (r) => {
-						this.frm.set_value("billing_address", r.message.primary_address || "");
+						if (!this.frm.doc.billing_address)
+							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.doc.shipping_address || ""
-						);
+						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 || "");
 					},
 				});
 				erpnext.utils.set_letter_head(this.frm)
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index ae3b7404f7f..6f74f5c81d1 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1023,6 +1023,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 				set_pricing();
 			}
 
+<<<<<<< HEAD
 		}
 
 		if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
@@ -1034,6 +1035,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 						set_party_account(set_pricing);
 					});
 				}
+=======
+		if (
+			frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
+			["Purchase Order", "Purchase Receipt", "Purchase Invoice"].includes(this.frm.doctype) &&
+			!this.frm.doc.shipping_address
+		) {
+			let is_drop_ship = me.frm.doc.items.some((item) => item.delivered_by_supplier);
+>>>>>>> 0678638106 (fix: preserve address if present)
 
 		} else {
 			set_party_account(set_pricing);