diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 20404089210..7f86520c573 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -249,6 +249,7 @@ class IColumn;
     M(Bool, use_index_for_in_with_subqueries, true, "Try using an index if there is a subquery or a table expression on the right side of the IN operator.", 0) \
     M(Bool, joined_subquery_requires_alias, true, "Force joined subqueries and table functions to have aliases for correct name qualification.", 0) \
     M(Bool, empty_result_for_aggregation_by_empty_set, false, "Return empty result when aggregating without keys on empty set.", 0) \
+    M(Bool, empty_result_for_aggregation_by_constant_keys_on_empty_set, true, "Return empty result when aggregating by constant keys on empty set.", 0) \
     M(Bool, allow_distributed_ddl, true, "If it is set to true, then a user is allowed to executed distributed DDL queries.", 0) \
     M(Bool, allow_suspicious_codecs, false, "If it is set to true, allow to specify meaningless compression codecs.", 0) \
     M(Bool, allow_experimental_codecs, false, "If it is set to true, allow to specify experimental compression codecs (but we don't have those yet and this option does nothing).", 0) \
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 33f9deaf805..20ab3152087 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -2044,7 +2044,9 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
         settings.group_by_two_level_threshold,
         settings.group_by_two_level_threshold_bytes,
         settings.max_bytes_before_external_group_by,
-        settings.empty_result_for_aggregation_by_empty_set || (keys.empty() && query_analyzer->hasConstAggregationKeys()),
+        settings.empty_result_for_aggregation_by_empty_set
+            || (settings.empty_result_for_aggregation_by_constant_keys_on_empty_set && keys.empty()
+                && query_analyzer->hasConstAggregationKeys()),
         context->getTemporaryVolume(),
         settings.max_threads,
         settings.min_free_disk_space_for_temporary_data,
diff --git a/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference b/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
index 573541ac970..93f9e3d10db 100644
--- a/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
+++ b/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
@@ -1 +1,2 @@
 0
+1	0
diff --git a/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql b/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
index 8a5de0e7c4f..a73c06bbe49 100644
--- a/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
+++ b/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
@@ -1,2 +1,4 @@
-SELECT 1 as a, count() FROM numbers(10)　WHERE 0 GROUP BY a;
-SELECT count() FROM numbers(10) WHERE 0
+SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a;
+SELECT count() FROM numbers(10) WHERE 0;
+
+SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a SETTINGS empty_result_for_aggregation_by_constant_keys_on_empty_set = 0;