diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 1c3996783e85bd0dba19743f343fb2b5ee557b45..97453f27286c7e314f8efe639e2d396a5ecc7ff1 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -888,7 +888,7 @@ def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
 	company = filters.get("company")
 	taxes = item_doc.taxes or []
 
-	while item_group:
+	while not taxes and item_group: # @dokos
 		item_group_doc = frappe.get_cached_doc("Item Group", item_group)
 		taxes += item_group_doc.taxes or []
 		item_group = item_group_doc.parent_item_group