diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java b/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java
index 371dc377af..88cd4a789c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONArrayAgg.java
@@ -185,6 +185,7 @@ implements JSONArrayAggOrderByStep<J> {
 
         ctx.sql(')');
 
+        acceptFilterClause(ctx);
         acceptOverClause(ctx);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java b/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
index aaf6886aee..4c24b34ff9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
@@ -164,6 +164,8 @@ implements JSONObjectAggNullStep<J> {
             ctx.sql(' ').visit(jsonReturning);
 
         ctx.sql(')');
+
+        acceptFilterClause(ctx);
         acceptOverClause(ctx);
     }