diff --git a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
index 01b674340a2..3fbdc5f36b0 100644
--- a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
+++ b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
@@ -107,10 +107,10 @@ class AutoMatchbyPartyDescription:
 		or_filters = []
 
 		if self.bank_party_name:
-			or_filters.append(["bank_party_name_desc", self.bank_party_name])
+			or_filters.append({"bank_party_name_desc": self.bank_party_name})
 
 		if self.description:
-			or_filters.append(["bank_party_name_desc", self.description])
+			or_filters.append({"bank_party_name_desc": self.description})
 
 		mapper_res = frappe.get_all(
 			"Bank Party Mapper",
@@ -156,7 +156,13 @@ class AutoMatchbyPartyDescription:
 		if result:
 			party_name, score, index = result
 			if score > 75:
-				return (party, party_name, {"bank_party_name_desc": self.get(field)})
+				# Dont set description as a key in Bank Party Mapper due to its volatility
+				mapper = {"bank_party_name_desc": self.get(field)} if field == "bank_party_name" else None
+				return (
+					party,
+					party_name,
+					mapper,
+				)
 			else:
 				return None
 
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
index 745450423bd..118705d0d3d 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -18,9 +18,6 @@ class BankTransaction(StatusUpdater):
 		self.unallocated_amount = abs(flt(self.withdrawal) - flt(self.deposit))
 
 	def on_update(self):
-		if self.party_type and self.party:
-			return
-
 		self.auto_set_party()
 
 	def on_submit(self):
@@ -162,6 +159,9 @@ class BankTransaction(StatusUpdater):
 		# TODO: check if enabled
 		from erpnext.accounts.doctype.bank_transaction.auto_match_party import AutoMatchParty
 
+		if self.party_type and self.party:
+			return
+
 		result = AutoMatchParty(
 			bank_party_account_number=self.bank_party_account_number,
 			bank_party_iban=self.bank_party_iban,