diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index eec8b374424..fbf3420668c 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -88,6 +88,15 @@ AggregateFunctionPtr AggregateFunctionFactory::get(
 
         AggregateFunctionPtr nested_function = getImpl(
             name, nested_types, nested_parameters, out_properties, has_null_arguments);
+
+        // Pure window functions are not real aggregate functions. Applying
+        // combinators doesn't make sense for them, they must handle the
+        // nullability themselves.
+        if (nested_function->asWindowFunction())
+        {
+            return nested_function;
+        }
+
         return combinator->transformAggregateFunction(nested_function, out_properties, type_without_low_cardinality, parameters);
     }
 
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 2b54328688d..5bbcd28d79b 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1054,6 +1054,10 @@ settings max_block_size = 3;
 13	2	10	12	10	10	143
 14	2	10	13	10	10	154
 15	3	15	0	15	15	15
+-- careful with auto-application of Null combinator
+select lagInFrame(toNullable(1)) over ();
+0
+select lagInFrameOrNull(1) over (); -- { serverError 36 }
 -- case-insensitive SQL-standard synonyms for any and anyLast
 select
     number,
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 9c6f1a7401c..458dfb7393e 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -376,6 +376,10 @@ order by number
 settings max_block_size = 3;
 ;
 
+-- careful with auto-application of Null combinator
+select lagInFrame(toNullable(1)) over ();
+select lagInFrameOrNull(1) over (); -- { serverError 36 }
+
 -- case-insensitive SQL-standard synonyms for any and anyLast
 select
     number,