diff --git a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
index 01766a9d85..1fbbbf9e57 100644
--- a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
@@ -30,7 +30,8 @@ function Overview({type, path, database, databaseFullPath}: OverviewProps) {
 
     const {currentData, isFetching, error} = overviewApi.useGetOverviewQuery(
         {path, database, databaseFullPath},
-        {pollingInterval: autoRefreshInterval},
+        //overview is not supported for streaming query, data request is inside StreamingQueryInfo
+        {pollingInterval: autoRefreshInterval, skip: type === EPathType.EPathTypeStreamingQuery},
     );
 
     const loading = isFetching && currentData === undefined;
@@ -79,7 +80,7 @@ function Overview({type, path, database, databaseFullPath}: OverviewProps) {
                 />
             ),
             [EPathType.EPathTypeStreamingQuery]: () => (
-                <StreamingQueryInfo data={data} path={path} database={database} />
+                <StreamingQueryInfo path={path} database={database} />
             ),
         };
 
diff --git a/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/StreamingQueryInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/StreamingQueryInfo.tsx
index f4b4ba685d..fa8f4d481b 100644
--- a/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/StreamingQueryInfo.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/StreamingQueryInfo.tsx
@@ -2,12 +2,13 @@ import React from 'react';
 
 import {Label} from '@gravity-ui/uikit';
 
+import {LoaderWrapper} from '../../../../../components/LoaderWrapper/LoaderWrapper';
 import {YDBSyntaxHighlighter} from '../../../../../components/SyntaxHighlighter/YDBSyntaxHighlighter';
 import {YDBDefinitionList} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
 import type {YDBDefinitionListItem} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
 import {streamingQueriesApi} from '../../../../../store/reducers/streamingQuery/streamingQuery';
 import type {ErrorResponse} from '../../../../../types/api/query';
-import type {TEvDescribeSchemeResult} from '../../../../../types/api/schema';
+import {EPathType} from '../../../../../types/api/schema';
 import type {IQueryResult} from '../../../../../types/store/query';
 import {
     getStringifiedData,
@@ -21,31 +22,25 @@ import {getEntityName} from '../../../utils';
 import i18n from './i18n';
 
 interface StreamingQueryProps {
-    data?: TEvDescribeSchemeResult;
     database: string;
     path: string;
 }
 
-/** Displays overview for StreamingQuery EPathType */
-export function StreamingQueryInfo({data, database, path}: StreamingQueryProps) {
-    const entityName = getEntityName(data?.PathDescription);
+export function StreamingQueryInfo({database, path}: StreamingQueryProps) {
+    const entityName = getEntityName({Self: {PathType: EPathType.EPathTypeStreamingQuery}});
 
-    if (!data) {
-        return (
-            <div className="error">
-                {i18n('alert_no-data')} {entityName}
-            </div>
-        );
-    }
-
-    const {data: sysData} = streamingQueriesApi.useGetStreamingQueryInfoQuery(
+    const {data: sysData, isFetching} = streamingQueriesApi.useGetStreamingQueryInfoQuery(
         {database, path},
         {skip: !database || !path},
     );
 
     const items = prepareStreamingQueryItems(sysData);
 
-    return <YDBDefinitionList title={entityName} items={items} />;
+    return (
+        <LoaderWrapper loading={isFetching}>
+            <YDBDefinitionList title={entityName} items={items} />
+        </LoaderWrapper>
+    );
 }
 
 const STATE_THEME_MAP: Record<string, React.ComponentProps<typeof Label>['theme']> = {
diff --git a/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/i18n/en.json b/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/i18n/en.json
index 4fac301e24..57f57f4d0b 100644
--- a/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/i18n/en.json
+++ b/src/containers/Tenant/Diagnostics/Overview/StreamingQueryInfo/i18n/en.json
@@ -1,5 +1,4 @@
 {
-  "alert_no-data": "No data for entity:",
   "field_query-state": "State",
   "field_query-error": "Error",
   "field_query-text": "Text"