diff --git a/src/containers/Node/Node.tsx b/src/containers/Node/Node.tsx
index a0ecf0849e..93da57d2ba 100644
--- a/src/containers/Node/Node.tsx
+++ b/src/containers/Node/Node.tsx
@@ -18,8 +18,7 @@ import {useAutoRefreshInterval, useTypedDispatch} from '../../utils/hooks';
 import {StorageWrapper} from '../Storage/StorageWrapper';
 import {Tablets} from '../Tablets';
 
-import {NODE_PAGES, OVERVIEW, STORAGE, STRUCTURE, TABLETS} from './NodePages';
-import NodeStructure from './NodeStructure/NodeStructure';
+import {NODE_PAGES, OVERVIEW, STORAGE, TABLETS} from './NodePages';
 
 import './Node.scss';
 
@@ -136,9 +135,6 @@ export function Node(props: NodeProps) {
                 return <FullNodeViewer node={node} className={b('overview-wrapper')} />;
             }
 
-            case STRUCTURE: {
-                return <NodeStructure className={b('node-page-wrapper')} nodeId={nodeId} />;
-            }
             default:
                 return false;
         }
diff --git a/src/containers/Node/NodePages.ts b/src/containers/Node/NodePages.ts
index 235b060092..71c4998bc7 100644
--- a/src/containers/Node/NodePages.ts
+++ b/src/containers/Node/NodePages.ts
@@ -17,10 +17,11 @@ export const NODE_PAGES = [
         id: STORAGE,
         name: 'Storage',
     },
-    {
-        id: STRUCTURE,
-        name: 'Structure',
-    },
+    // TODO: remove Node Structure component
+    // {
+    //     id: STRUCTURE,
+    //     name: 'Structure',
+    // },
     {
         id: TABLETS,
         name: 'Tablets',
diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx
index 1c68070cbc..f4c1d1e24d 100644
--- a/src/containers/Storage/Storage.tsx
+++ b/src/containers/Storage/Storage.tsx
@@ -72,7 +72,7 @@ export const Storage = ({additionalNodesProps, database, nodeId}: StorageProps)
         uptimeFilter: StringParam,
         usageFilter: UsageFilterParam,
     });
-    const type = storageTypeSchema.parse(queryParams.type);
+    const storageType = storageTypeSchema.parse(queryParams.type);
     const visibleEntities = visibleEntitiesSchema.parse(queryParams.visible);
     const filter = queryParams.search ?? '';
     const uptimeFilter = nodesUptimeFilterValuesSchema.parse(queryParams.uptimeFilter);
@@ -90,12 +90,8 @@ export const Storage = ({additionalNodesProps, database, nodeId}: StorageProps)
     });
     const groupsSortParams = groupSort.sortOrder ? groupSort : getDefaultSortGroup(visibleEntities);
 
-    // Do not display Nodes table for Node page (NodeId present)
-    const isNodePage = nodeId !== undefined;
-    const storageType = isNodePage ? STORAGE_TYPES.groups : type;
-
     const nodesQuery = storageApi.useGetStorageNodesInfoQuery(
-        {database, visibleEntities},
+        {database, visibleEntities, node_id: nodeId},
         {
             skip: storageType !== STORAGE_TYPES.nodes,
             pollingInterval: autoRefreshInterval,
@@ -198,7 +194,7 @@ export const Storage = ({additionalNodesProps, database, nodeId}: StorageProps)
             <StorageControls
                 searchValue={filter}
                 handleSearchValueChange={handleTextFilterChange}
-                withTypeSelector={!isNodePage}
+                withTypeSelector
                 storageType={storageType}
                 handleStorageTypeChange={handleStorageTypeChange}
                 visibleEntities={visibleEntities}
diff --git a/src/services/api.ts b/src/services/api.ts
index 98b9d4b832..f7e26863ed 100644
--- a/src/services/api.ts
+++ b/src/services/api.ts
@@ -224,6 +224,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
                 // TODO: remove after remove tenant param
                 database: params.database || params.tenant,
                 tenant: params.tenant || params.database,
+                node_id: params.node_id,
             },
             {concurrentId, requestConfig: {signal}},
         );