diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 301b6366b2..1bdb5d1cb9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -12433,6 +12433,9 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
             else
                 ordered = distinct ? listAggDistinct(field) : listAgg(field);
 
+            if (parseKeywordIf("ORDER BY"))
+                ordered.withinGroupOrderBy(parseList(',', c -> c.parseSortField()));
+
             parse(')');
         }
         else