diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.scss b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.scss
index 967ec2b2a8..14433f4f43 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.scss
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.scss
@@ -33,6 +33,11 @@
         margin-right: var(--g-spacing-2);
     }
 
+    &__output-chunk-max-size {
+        width: 50%;
+        margin-right: var(--g-spacing-2);
+    }
+
     &__pragmas {
         width: 100%;
     }
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
index b37edde230..c8ab3737e1 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx
@@ -14,6 +14,7 @@ import type {QuerySettings} from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
 import {
     useQueryExecutionSettings,
+    useQueryStreamingSetting,
     useSetting,
     useTypedDispatch,
     useTypedSelector,
@@ -84,6 +85,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
 
     const [useShowPlanToSvg] = useSetting<boolean>(SETTING_KEYS.USE_SHOW_PLAN_SVG);
     const enableTracingLevel = useTracingLevelOptionAvailable();
+    const [isQueryStreamingEnabled] = useQueryStreamingSetting();
 
     const timeout = watch('timeout');
     const queryMode = watch('queryMode');
@@ -220,6 +222,39 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                         />
                     </div>
                 </Flex>
+                {isQueryStreamingEnabled && (
+                    <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
+                        <label htmlFor="outputChunkMaxSize" className={b('field-title')}>
+                            {QUERY_SETTINGS_FIELD_SETTINGS.outputChunkMaxSize.title}
+                        </label>
+                        <div className={b('control-wrapper')}>
+                            <Controller
+                                name="outputChunkMaxSize"
+                                control={control}
+                                render={({field}) => (
+                                    <TextInput
+                                        id="outputChunkMaxSize"
+                                        type="number"
+                                        {...field}
+                                        value={field.value?.toString()}
+                                        className={b('output-chunk-max-size')}
+                                        placeholder="1000000"
+                                        validationState={
+                                            errors.outputChunkMaxSize ? 'invalid' : undefined
+                                        }
+                                        errorMessage={errors.outputChunkMaxSize?.message}
+                                        errorPlacement="inside"
+                                        endContent={
+                                            <span className={b('postfix')}>
+                                                {i18n('form.output.chunk.max.size.bytes')}
+                                            </span>
+                                        }
+                                    />
+                                )}
+                            />
+                        </div>
+                    </Flex>
+                )}
                 <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
                     <label htmlFor="pragmas" className={b('field-title')}>
                         {QUERY_SETTINGS_FIELD_SETTINGS.pragmas.title}
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts b/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
index 823ed04fd9..ef71db017b 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/constants.ts
@@ -151,6 +151,9 @@ export const QUERY_SETTINGS_FIELD_SETTINGS = {
     limitRows: {
         title: formI18n('form.limit-rows'),
     },
+    outputChunkMaxSize: {
+        title: formI18n('form.output.chunk.max.size'),
+    },
     pragmas: {
         title: formI18n('form.pragmas'),
     },
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
index 8fd7290e9b..1cc858cf0c 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/en.json
@@ -6,6 +6,8 @@
   "form.statistics-mode": "Statistics collection mode",
   "form.tracing-level": "Tracing level",
   "form.limit-rows": "Limit rows",
+  "form.output.chunk.max.size": "Output chunk max size",
+  "form.output.chunk.max.size.bytes": "bytes",
   "form.pragmas": "Pragmas",
   "button-done": "Save",
   "tooltip_plan-to-svg-statistics": "Statistics option is set to \"Full\" due to the enabled \"Execution plan\" experiment.\n To disable it, go to the \"Experiments\" section in the user settings.",
diff --git a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
index 6bcbdd9ab2..302db60ba8 100644
--- a/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
+++ b/src/containers/Tenant/Query/QuerySettingsDialog/i18n/ru.json
@@ -6,6 +6,8 @@
   "form.statistics-mode": "Режим сбора статистики",
   "form.tracing-level": "Tracing level",
   "form.limit-rows": "Лимит строк",
+  "form.output.chunk.max.size": "Максимальный размер чанка",
+  "form.output.chunk.max.size.bytes": "байт",
   "form.pragmas": "Прагмы",
   "tooltip_plan-to-svg-statistics": "Опция статистики установлена в значение \"Full\" из-за включенного эксперимента \"Execution plan\".\n Чтобы отключить его, перейдите в раздел \"Experiments\" в настройках пользователя.",
   "button-done": "Готово",
diff --git a/src/store/reducers/query/query.ts b/src/store/reducers/query/query.ts
index 657310ee48..bae3f22575 100644
--- a/src/store/reducers/query/query.ts
+++ b/src/store/reducers/query/query.ts
@@ -132,7 +132,6 @@ interface SendQueryParams extends QueryRequestParams {
 // Stream query receives queryId from session chunk.
 type StreamQueryParams = Omit<SendQueryParams, 'queryId'>;
 
-const DEFAULT_STREAM_CHUNK_SIZE = 1000;
 const DEFAULT_CONCURRENT_RESULTS = false;
 
 export const queryApi = api.injectEndpoints({
@@ -192,7 +191,9 @@ export const queryApi = api.injectEndpoints({
                             timeout: isNumeric(querySettings.timeout)
                                 ? Number(querySettings.timeout) * 1000
                                 : undefined,
-                            output_chunk_max_size: DEFAULT_STREAM_CHUNK_SIZE,
+                            output_chunk_max_size: isNumeric(querySettings.outputChunkMaxSize)
+                                ? Number(querySettings.outputChunkMaxSize)
+                                : undefined,
                             concurrent_results: DEFAULT_CONCURRENT_RESULTS || undefined,
                             base64,
                         },
diff --git a/src/utils/query.ts b/src/utils/query.ts
index 24173add71..3b41801c98 100644
--- a/src/utils/query.ts
+++ b/src/utils/query.ts
@@ -330,6 +330,10 @@ export const querySettingsValidationSchema = z.object({
         (val) => (val === '' ? undefined : val),
         z.coerce.number().gt(0).lte(100_000).or(z.undefined()),
     ),
+    outputChunkMaxSize: z.preprocess(
+        (val) => (val === '' ? undefined : val),
+        z.coerce.number().int().positive().or(z.undefined()),
+    ),
     queryMode: queryModeSchema,
     transactionMode: transactionModeSchema,
     statisticsMode: statisticsModeSchema,
@@ -347,6 +351,10 @@ export const querySettingsRestoreSchema = z
             (val) => (val === '' ? undefined : val),
             z.coerce.number().gt(0).lte(100_000).optional().catch(DEFAULT_QUERY_SETTINGS.limitRows),
         ),
+        outputChunkMaxSize: z.preprocess(
+            (val) => (val === '' ? undefined : val),
+            z.coerce.number().int().positive().optional(),
+        ),
         queryMode: queryModeSchema.catch(DEFAULT_QUERY_SETTINGS.queryMode),
         transactionMode: transactionModeSchema.catch(DEFAULT_QUERY_SETTINGS.transactionMode),
         statisticsMode: statisticsModeSchema.catch(DEFAULT_QUERY_SETTINGS.statisticsMode),