diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index abf8781..07fb5e8 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -220,16 +220,6 @@
 			return erpnext.journal_entry.account_query(me.frm);
 		});
 
-		me.frm.set_query("against_account_link", "accounts", function(doc, cdt, cdn) {
-			return erpnext.journal_entry.against_account_query(me.frm);
-		});
-
-		me.frm.set_query("against_type", "accounts", function(){
-			return {
-				query: "erpnext.accounts.doctype.journal_entry.journal_entry.get_against_type",
-			}
-		})
-
 		me.frm.set_query("party_type", "accounts", function(doc, cdt, cdn) {
 			const row = locals[cdt][cdn];
 
@@ -601,21 +591,6 @@
 		return { filters: filters };
 	},
 
-	against_account_query: function(frm) {
-		if (frm.doc.against_type != "Account"){
-			return { filters: {} };
-		}
-		else {
-			let filters = { company: frm.doc.company, is_group: 0 };
-			if(!frm.doc.multi_currency) {
-				$.extend(filters, {
-					account_currency: ['in', [frappe.get_doc(":Company", frm.doc.company).default_currency, null]]
-				});
-			}
-			return { filters: filters };
-		}
-	},
-
 	reverse_journal_entry: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_reverse_journal_entry",
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index b8c79f9..40d552b 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -1625,10 +1625,3 @@
 	)
 
 	return doclist
-
-
-@frappe.whitelist()
-def get_against_type(doctype, txt, searchfield, start, page_len, filters):
-	against_types = frappe.db.get_list("Party Type", pluck="name") + ["Account"]
-	doctype = frappe.qb.DocType("DocType")
-	return frappe.qb.from_(doctype).select(doctype.name).where(doctype.name.isin(against_types)).run()
