diff --git a/frappe/database/query.py b/frappe/database/query.py
index d5d2dd1aec..99e336e668 100644
--- a/frappe/database/query.py
+++ b/frappe/database/query.py
@@ -356,11 +356,7 @@ class Engine:
 
 		# Track field aliases for use in group_by/order_by
 		for field in self.fields:
-			if isinstance(field, Field | DynamicTableField) and field.alias:
-				self.field_aliases.add(field.alias)
-			elif self.is_postgres and getattr(
-				field, "alias", None
-			):  # captures aggregate functions (for pg order by fix)
+			if isinstance(field, Field | DynamicTableField | AggregateFunction) and field.alias:
 				self.field_aliases.add(field.alias)
 
 		if self.apply_permissions: