diff --git a/src/Analyzer/Utils.cpp b/src/Analyzer/Utils.cpp
index 8ccf95deadc..2882c4e0c02 100644
--- a/src/Analyzer/Utils.cpp
+++ b/src/Analyzer/Utils.cpp
@@ -760,4 +760,26 @@ QueryTreeNodePtr createCastFunction(QueryTreeNodePtr node, DataTypePtr result_ty
     return function_node;
 }
 
+QueryTreeNodePtr buildSubqueryToReadColumnsFromTableExpression(QueryTreeNodePtr table_node, const ContextPtr & context)
+{
+    const auto & storage_snapshot = table_node->as<TableNode>()->getStorageSnapshot();
+    auto columns_to_select = storage_snapshot->getColumns(GetColumnsOptions(GetColumnsOptions::Ordinary));
+    size_t columns_to_select_size = columns_to_select.size();
+    auto column_nodes_to_select = std::make_shared<ListNode>();
+    column_nodes_to_select->getNodes().reserve(columns_to_select_size);
+    NamesAndTypes projection_columns;
+    projection_columns.reserve(columns_to_select_size);
+    for (auto & column : columns_to_select)
+    {
+        column_nodes_to_select->getNodes().emplace_back(std::make_shared<ColumnNode>(column, table_node));
+        projection_columns.emplace_back(column.name, column.type);
+    }
+    auto subquery_for_table = std::make_shared<QueryNode>(Context::createCopy(context));
+    subquery_for_table->setIsSubquery(true);
+    subquery_for_table->getProjectionNode() = std::move(column_nodes_to_select);
+    subquery_for_table->getJoinTree() = std::move(table_node);
+    subquery_for_table->resolveProjectionColumns(std::move(projection_columns));
+    return subquery_for_table;
+}
+
 }
diff --git a/src/Analyzer/Utils.h b/src/Analyzer/Utils.h
index 8e32ef0464c..1b4a7d5ef3c 100644
--- a/src/Analyzer/Utils.h
+++ b/src/Analyzer/Utils.h
@@ -105,4 +105,7 @@ NameSet collectIdentifiersFullNames(const QueryTreeNodePtr & node);
 /// Wrap node into `_CAST` function
 QueryTreeNodePtr createCastFunction(QueryTreeNodePtr node, DataTypePtr result_type, ContextPtr context);
 
+/// Build subquery which we execute for `IN table` function.
+QueryTreeNodePtr buildSubqueryToReadColumnsFromTableExpression(QueryTreeNodePtr table_node, const ContextPtr & context);
+
 }
diff --git a/src/Planner/CollectSets.cpp b/src/Planner/CollectSets.cpp
index 37502828f63..b1f2875210d 100644
--- a/src/Planner/CollectSets.cpp
+++ b/src/Planner/CollectSets.cpp
@@ -23,35 +23,6 @@ namespace ErrorCodes
 {
     extern const int UNSUPPORTED_METHOD;
 }
-
-QueryTreeNodePtr makeExecutableSubqueryForIn(const QueryTreeNodePtr & in_second_argument, const ContextPtr & context)
-{
-    auto subquery_to_execute = in_second_argument;
-    if (auto * table_node = in_second_argument->as<TableNode>())
-    {
-        auto storage_snapshot = table_node->getStorageSnapshot();
-        auto columns_to_select = storage_snapshot->getColumns(GetColumnsOptions(GetColumnsOptions::Ordinary));
-        size_t columns_to_select_size = columns_to_select.size();
-        auto column_nodes_to_select = std::make_shared<ListNode>();
-        column_nodes_to_select->getNodes().reserve(columns_to_select_size);
-        NamesAndTypes projection_columns;
-        projection_columns.reserve(columns_to_select_size);
-        for (auto & column : columns_to_select)
-        {
-            column_nodes_to_select->getNodes().emplace_back(std::make_shared<ColumnNode>(column, subquery_to_execute));
-            projection_columns.emplace_back(column.name, column.type);
-        }
-        auto subquery_for_table = std::make_shared<QueryNode>(Context::createCopy(context));
-        subquery_for_table->setIsSubquery(true);
-        subquery_for_table->getProjectionNode() = std::move(column_nodes_to_select);
-        subquery_for_table->getJoinTree() = std::move(subquery_to_execute);
-        subquery_for_table->resolveProjectionColumns(std::move(projection_columns));
-        subquery_to_execute = std::move(subquery_for_table);
-    }
-
-    return subquery_to_execute;
-}
-
 namespace
 {
 
@@ -116,7 +87,10 @@ public:
             if (sets.findSubquery(set_key))
                 return;
 
-            auto subquery_to_execute = makeExecutableSubqueryForIn(in_second_argument, planner_context.getQueryContext());
+            auto subquery_to_execute = in_second_argument;
+            if (in_second_argument->as<TableNode>())
+                subquery_to_execute = buildSubqueryToReadColumnsFromTableExpression(std::move(subquery_to_execute), planner_context.getQueryContext());
+
             sets.addFromSubquery(set_key, std::move(subquery_to_execute), settings);
         }
         else
diff --git a/src/Planner/CollectSets.h b/src/Planner/CollectSets.h
index 0ee006f3320..5f9f7a5a466 100644
--- a/src/Planner/CollectSets.h
+++ b/src/Planner/CollectSets.h
@@ -14,8 +14,4 @@ struct SelectQueryOptions;
   */
 void collectSets(const QueryTreeNodePtr & node, PlannerContext & planner_context);
 
-/// Build subquery which we execute for IN function.
-/// It is needed to support `IN table` case.
-QueryTreeNodePtr makeExecutableSubqueryForIn(const QueryTreeNodePtr & in_second_argument, const ContextPtr & context);
-
 }
diff --git a/src/Storages/buildQueryTreeForShard.cpp b/src/Storages/buildQueryTreeForShard.cpp
index 09e48a93df4..5bbdbe487b0 100644
--- a/src/Storages/buildQueryTreeForShard.cpp
+++ b/src/Storages/buildQueryTreeForShard.cpp
@@ -13,7 +13,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
-#include <Planner/CollectSets.h>
 #include <Planner/Utils.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
@@ -365,7 +364,9 @@ QueryTreeNodePtr buildQueryTreeForShard(const PlannerContextPtr & planner_contex
             if (in_function_node_type != QueryTreeNodeType::QUERY && in_function_node_type != QueryTreeNodeType::UNION && in_function_node_type != QueryTreeNodeType::TABLE)
                 continue;
 
-            auto subquery_to_execute = makeExecutableSubqueryForIn(in_function_subquery_node, planner_context->getQueryContext());
+            auto subquery_to_execute = in_function_subquery_node;
+            if (subquery_to_execute->as<TableNode>())
+                subquery_to_execute = buildSubqueryToReadColumnsFromTableExpression(std::move(subquery_to_execute), planner_context->getQueryContext());
 
             auto temporary_table_expression_node = executeSubqueryNode(subquery_to_execute,
                 planner_context->getMutableQueryContext(),