diff --git a/src/Analyzer/Passes/QueryAnalysisPass.cpp b/src/Analyzer/Passes/QueryAnalysisPass.cpp
index 9db2d66d99d..4f24051df79 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.cpp
+++ b/src/Analyzer/Passes/QueryAnalysisPass.cpp
@@ -5527,9 +5527,15 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
       * 3. Check that there are no columns that are not specified in GROUP BY keys.
       * 4. Validate GROUP BY modifiers.
       */
-    assertNoAggregateFunctionNodes(query_node_typed.getJoinTree(), "in JOIN TREE");
-    assertNoGroupingFunction(query_node_typed.getJoinTree(), "in JOIN TREE");
-    assertNoWindowFunctionNodes(query_node_typed.getJoinTree(), "in JOIN TREE");
+    auto join_tree_node_type = query_node_typed.getJoinTree()->getNodeType();
+    bool join_tree_is_subquery = join_tree_node_type == QueryTreeNodeType::QUERY || join_tree_node_type == QueryTreeNodeType::UNION;
+
+    if (!join_tree_is_subquery)
+    {
+        assertNoAggregateFunctionNodes(query_node_typed.getJoinTree(), "in JOIN TREE");
+        assertNoGroupingFunction(query_node_typed.getJoinTree(), "in JOIN TREE");
+        assertNoWindowFunctionNodes(query_node_typed.getJoinTree(), "in JOIN TREE");
+    }
 
     if (query_node_typed.hasWhere())
     {
diff --git a/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.reference b/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.reference
new file mode 100644
index 00000000000..623ba8fde99
--- /dev/null
+++ b/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.reference
@@ -0,0 +1,3 @@
+45
+--
+45
diff --git a/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql b/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql
new file mode 100644
index 00000000000..eda90529166
--- /dev/null
+++ b/tests/queries/0_stateless/02475_analyzer_join_tree_subquery.sql
@@ -0,0 +1,7 @@
+SET allow_experimental_analyzer = 1;
+
+WITH subquery AS (SELECT sum(number) FROM numbers(10)) SELECT * FROM subquery;
+
+SELECT '--';
+
+WITH subquery AS (SELECT sum(number) FROM numbers(10)) SELECT (SELECT * FROM subquery);