diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/ManagePartitioningDialog.tsx b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/ManagePartitioningDialog.tsx
index f6f34f0599..f210688313 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/ManagePartitioningDialog.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/ManagePartitioningDialog.tsx
@@ -46,12 +46,14 @@ function ManagePartitioningDialog({
     const {
         control,
         handleSubmit,
+        watch,
         trigger,
         formState: {errors, isValid},
     } = useManagePartitioningForm({
         initialValue,
         maxSplitSizeBytes: DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES,
     });
+    const splitSizeEnabled = watch('splitSizeEnabled');
 
     const handleApply = handleSubmit(async (data) => {
         setApiError(null);
@@ -76,6 +78,27 @@ function ManagePartitioningDialog({
                     <Flex direction="column" gap="3" alignItems="flex-start">
                         <Text variant="subheader-1">{i18n('title_partitioning')}</Text>
 
+                        <Flex className={b('row')} gap="3" alignItems="center">
+                            <label htmlFor="splitSizeEnabled" className={b('label')}>
+                                {i18n('field_size')}
+                            </label>
+
+                            <Controller
+                                name="splitSizeEnabled"
+                                control={control}
+                                render={({field}) => (
+                                    <Switch
+                                        id="splitSizeEnabled"
+                                        checked={field.value}
+                                        onUpdate={(next) => {
+                                            field.onChange(next);
+                                            trigger('splitSize');
+                                        }}
+                                    />
+                                )}
+                            />
+                        </Flex>
+
                         <Flex className={b('row')} gap="3" alignItems="center">
                             <label htmlFor="splitSize" className={b('label')}>
                                 {i18n('field_split-size')}
@@ -90,6 +113,7 @@ function ManagePartitioningDialog({
                                         type="number"
                                         value={field.value}
                                         onUpdate={field.onChange}
+                                        disabled={!splitSizeEnabled}
                                         className={b('input')}
                                         errorMessage={errors.splitSize?.message}
                                         validationState={errors.splitSize ? 'invalid' : undefined}
@@ -101,6 +125,7 @@ function ManagePartitioningDialog({
                                                     <SplitUnitSelect
                                                         value={unitField.value}
                                                         options={UNIT_OPTIONS}
+                                                        disabled={!splitSizeEnabled}
                                                         onChange={(nextUnit) => {
                                                             unitField.onChange(nextUnit);
                                                             trigger('splitSize');
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/SplitUnitSelect.tsx b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/SplitUnitSelect.tsx
index 2f1795622d..2cf385af9f 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/SplitUnitSelect.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/SplitUnitSelect.tsx
@@ -14,6 +14,7 @@ const b = cn('split-unit-select');
 interface SplitUnitSelectProps {
     value: string;
     options: UnitOptionsType;
+    disabled?: boolean;
     width?: number;
     size?: SelectProps['size'];
     onChange: (nextValue: string) => void;
@@ -22,6 +23,7 @@ interface SplitUnitSelectProps {
 export function SplitUnitSelect({
     value,
     options,
+    disabled = false,
     width = 55,
     size = 's',
     onChange,
@@ -44,7 +46,13 @@ export function SplitUnitSelect({
 
     const renderControl: SelectProps['renderControl'] = React.useCallback(
         () => (
-            <Button type="button" className={b('button')} size={size} onClick={handleToggleOpen}>
+            <Button
+                type="button"
+                className={b('button')}
+                size={size}
+                onClick={handleToggleOpen}
+                disabled={disabled}
+            >
                 <Flex
                     justifyContent="space-between"
                     alignItems="center"
@@ -56,11 +64,12 @@ export function SplitUnitSelect({
                 </Flex>
             </Button>
         ),
-        [handleToggleOpen, selectedLabel, size],
+        [disabled, handleToggleOpen, selectedLabel, size],
     );
 
     return (
         <Select
+            disabled={disabled}
             size={size}
             className={b('select')}
             options={options}
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/__test__/utils.test.ts b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/__test__/utils.test.ts
new file mode 100644
index 0000000000..4a295dd5c0
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/__test__/utils.test.ts
@@ -0,0 +1,30 @@
+import {managePartitioningSchema} from '../utils';
+
+describe('managePartitioningSchema', () => {
+    test('allows submitting without split size when split-by-size is disabled', () => {
+        const result = managePartitioningSchema().safeParse({
+            splitSizeEnabled: false,
+            splitSize: '',
+            splitUnit: 'gb',
+            loadEnabled: true,
+            minimum: '10',
+            maximum: '20',
+        });
+
+        expect(result.success).toBe(true);
+    });
+
+    test('requires split size when split-by-size is enabled', () => {
+        const result = managePartitioningSchema().safeParse({
+            splitSizeEnabled: true,
+            splitSize: '',
+            splitUnit: 'gb',
+            loadEnabled: true,
+            minimum: '10',
+            maximum: '20',
+        });
+
+        expect(result.success).toBe(false);
+        expect(result.error?.flatten().fieldErrors.splitSize).toBeTruthy();
+    });
+});
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/constants.ts b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/constants.ts
index 32d5d7d429..fff0fb74f2 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/constants.ts
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/constants.ts
@@ -18,6 +18,7 @@ export const DEFAULT_MAX_SPLIT_SIZE_GB = formatBytes({
 });
 
 export const DEFAULT_MANAGE_PARTITIONING_VALUE: ManagePartitioningFormState = {
+    splitSizeEnabled: true,
     splitSize: DEFAULT_MAX_SPLIT_SIZE_GB,
     splitUnit: 'gb',
     loadEnabled: true,
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/i18n/en.json b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/i18n/en.json
index 040df8e56b..dde35bf9bb 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/i18n/en.json
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/i18n/en.json
@@ -4,6 +4,7 @@
   "title_limits": "Limits",
 
   "field_split-size": "Split Size",
+  "field_size": "Size",
   "context_split-size-maximum": "{{maxGb}} GB maximum",
   "field_load": "Load",
   "field_minimum": "Minimum",
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/types.ts b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/types.ts
index e29765c93e..9ec0f6d509 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/types.ts
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/types.ts
@@ -2,6 +2,7 @@ import type {BytesSizes} from '../../../../../../utils/bytesParsers';
 
 // Raw form model: stored and used for initialValues (TextInput works with strings)
 export interface ManagePartitioningFormState {
+    splitSizeEnabled: boolean;
     splitSize: string;
     splitUnit: BytesSizes;
     loadEnabled: boolean;
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.ts b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.ts
index 6e50fd16c0..497a86cfea 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.ts
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/ManagePartitioningDialog/utils.ts
@@ -28,15 +28,15 @@ export const splitUnitSchema = z.custom<BytesSizes>((value) => {
     return value in sizes;
 }, i18n('error_invalid-unit'));
 
-// Required positive number (> 0)
-const requiredPositiveNumber = (requiredMessage: string) =>
+// Optional positive number (> 0)
+const optionalPositiveNumber = () =>
     preprocessEmptyStringToUndefined(
         z.coerce
             .number({
-                required_error: requiredMessage,
-                invalid_type_error: requiredMessage,
+                invalid_type_error: i18n('error_required'),
             })
-            .gt(0),
+            .gt(0)
+            .optional(),
     );
 
 // Required positive integer (> 0)
@@ -56,7 +56,8 @@ export const managePartitioningSchema = (
 ) =>
     z
         .object({
-            splitSize: requiredPositiveNumber(i18n('error_required')),
+            splitSizeEnabled: z.boolean(),
+            splitSize: optionalPositiveNumber(),
             splitUnit: splitUnitSchema,
 
             loadEnabled: z.boolean(),
@@ -65,22 +66,35 @@ export const managePartitioningSchema = (
             maximum: requiredPositiveInt(i18n('error_required')),
         })
         .superRefine((data, ctx) => {
-            const {bytes, partitionSizeMb} = splitToPartitionSizeMb(data.splitSize, data.splitUnit);
-
-            if (bytes > maxSplitSizeBytes) {
+            if (data.splitSizeEnabled && data.splitSize === undefined) {
                 ctx.addIssue({
                     code: z.ZodIssueCode.custom,
                     path: ['splitSize'],
-                    message: i18n('error_value-greater-maximum'),
+                    message: i18n('error_required'),
                 });
             }
 
-            if (partitionSizeMb < 1) {
-                ctx.addIssue({
-                    code: z.ZodIssueCode.custom,
-                    path: ['splitSize'],
-                    message: i18n('error_value-too-small'),
-                });
+            if (data.splitSizeEnabled && data.splitSize !== undefined) {
+                const {bytes, partitionSizeMb} = splitToPartitionSizeMb(
+                    data.splitSize,
+                    data.splitUnit,
+                );
+
+                if (bytes > maxSplitSizeBytes) {
+                    ctx.addIssue({
+                        code: z.ZodIssueCode.custom,
+                        path: ['splitSize'],
+                        message: i18n('error_value-greater-maximum'),
+                    });
+                }
+
+                if (partitionSizeMb < 1) {
+                    ctx.addIssue({
+                        code: z.ZodIssueCode.custom,
+                        path: ['splitSize'],
+                        message: i18n('error_value-too-small'),
+                    });
+                }
             }
 
             if (data.minimum > data.maximum) {
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/__test__/utils.test.ts b/src/containers/Tenant/Diagnostics/Overview/TableInfo/__test__/utils.test.ts
new file mode 100644
index 0000000000..0479798ae4
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/__test__/utils.test.ts
@@ -0,0 +1,48 @@
+import {alterPartitioningSQL} from '../../../../../../store/reducers/tablePartitioning/tablePartitioning';
+import {sizes} from '../../../../../../utils/bytesParsers';
+import {DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES} from '../constants';
+import {prepareUpdatePartitioningRequest} from '../utils';
+
+describe('prepareUpdatePartitioningRequest', () => {
+    test('sets splitBySize=false and uses fallback partition size when split-by-size is disabled', () => {
+        const result = prepareUpdatePartitioningRequest(
+            {
+                splitSizeEnabled: false,
+                splitSize: '',
+                splitUnit: 'gb',
+                loadEnabled: true,
+                minimum: '3',
+                maximum: '10',
+            },
+            '/Root',
+            '/Root/table',
+        );
+
+        expect(result).toEqual({
+            database: '/Root',
+            path: '/Root/table',
+            value: {
+                splitBySize: false,
+                splitByLoad: true,
+                partitionSizeMb: Math.round(DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES / sizes.mb.value),
+                minPartitions: 3,
+                maxPartitions: 10,
+            },
+        });
+    });
+});
+
+describe('alterPartitioningSQL', () => {
+    test('generates AUTO_PARTITIONING_BY_SIZE = DISABLED when split-by-size is disabled', () => {
+        const query = alterPartitioningSQL('/Root/table', {
+            splitBySize: false,
+            splitByLoad: true,
+            partitionSizeMb: 2048,
+            minPartitions: 3,
+            maxPartitions: 10,
+        });
+
+        expect(query).toContain('AUTO_PARTITIONING_BY_SIZE = DISABLED');
+        expect(query).toContain('AUTO_PARTITIONING_BY_LOAD = ENABLED');
+    });
+});
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo.tsx
index f2faf4e024..97739e9025 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/prepareTableInfo.tsx
@@ -242,9 +242,12 @@ const prepareManagePartitioningDialogConfig = (
 ) => {
     const policy = partitionConfig?.PartitioningPolicy;
 
+    const splitBySizeEnabled = Number(policy?.SizeToSplit) > 0;
     const splitByLoadEnabled = Boolean(policy?.SplitByLoadSettings?.Enabled);
 
-    const bytes = Number(policy?.SizeToSplit ?? DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES);
+    const bytes = Number(
+        splitBySizeEnabled ? policy?.SizeToSplit : DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES,
+    );
     const size = formatBytes({
         value: bytes,
         withSizeLabel: false,
@@ -253,7 +256,8 @@ const prepareManagePartitioningDialogConfig = (
     const unit = getBytesSizeUnit(bytes);
 
     return {
-        splitSize: size,
+        splitSizeEnabled: splitBySizeEnabled,
+        splitSize: splitBySizeEnabled ? size : '',
         splitUnit: unit,
         loadEnabled: splitByLoadEnabled,
         minimum: String(progress?.minPartitions),
diff --git a/src/containers/Tenant/Diagnostics/Overview/TableInfo/utils.ts b/src/containers/Tenant/Diagnostics/Overview/TableInfo/utils.ts
index b82e73bf47..8be1fdf24b 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TableInfo/utils.ts
+++ b/src/containers/Tenant/Diagnostics/Overview/TableInfo/utils.ts
@@ -1,17 +1,28 @@
 import type {UpdateTablePartitioningParams} from '../../../../../types/store/partitioning';
+import {sizes} from '../../../../../utils/bytesParsers';
 
 import type {ManagePartitioningFormState} from './ManagePartitioningDialog/types';
 import {splitToPartitionSizeMb} from './ManagePartitioningDialog/utils';
+import {DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES} from './constants';
 
 export function prepareUpdatePartitioningRequest(
     value: ManagePartitioningFormState,
     database: string,
     path: string,
 ): UpdateTablePartitioningParams {
-    const {partitionSizeMb} = splitToPartitionSizeMb(Number(value.splitSize), value.splitUnit);
+    const splitSizeValue = Number(value.splitSize);
+    const hasValidSplitSize = Number.isFinite(splitSizeValue) && splitSizeValue > 0;
+    const fallbackPartitionSizeMb = Math.round(
+        DEFAULT_PARTITION_SIZE_TO_SPLIT_BYTES / sizes.mb.value,
+    );
+    const {partitionSizeMb} =
+        value.splitSizeEnabled && hasValidSplitSize
+            ? splitToPartitionSizeMb(splitSizeValue, value.splitUnit)
+            : {partitionSizeMb: fallbackPartitionSizeMb};
 
     return {
         value: {
+            splitBySize: value.splitSizeEnabled,
             partitionSizeMb,
             minPartitions: Number(value.minimum),
             maxPartitions: Number(value.maximum),
diff --git a/src/store/reducers/tablePartitioning/tablePartitioning.ts b/src/store/reducers/tablePartitioning/tablePartitioning.ts
index bd12385296..276ce3dd9d 100644
--- a/src/store/reducers/tablePartitioning/tablePartitioning.ts
+++ b/src/store/reducers/tablePartitioning/tablePartitioning.ts
@@ -6,14 +6,15 @@ import {QUERY_TECHNICAL_MARK} from '../../../utils/constants';
 import {isQueryErrorResponse} from '../../../utils/query';
 import {api} from '../api';
 
-function alterPartitioningSQL(path: string, values: UpdateTablePartitioningValues) {
+export function alterPartitioningSQL(path: string, values: UpdateTablePartitioningValues) {
     const safePath = path.replace(/`/g, '``');
 
+    const bySize = values.splitBySize ? 'ENABLED' : 'DISABLED';
     const byLoad = values.splitByLoad ? 'ENABLED' : 'DISABLED';
 
     return `${QUERY_TECHNICAL_MARK}
 ALTER TABLE \`${safePath}\` SET (
-    AUTO_PARTITIONING_BY_SIZE = ENABLED,
+    AUTO_PARTITIONING_BY_SIZE = ${bySize},
     AUTO_PARTITIONING_PARTITION_SIZE_MB = ${values.partitionSizeMb},
     AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = ${values.minPartitions},
     AUTO_PARTITIONING_MAX_PARTITIONS_COUNT = ${values.maxPartitions},
diff --git a/src/types/store/partitioning.ts b/src/types/store/partitioning.ts
index 562092990d..bcc64b4a39 100644
--- a/src/types/store/partitioning.ts
+++ b/src/types/store/partitioning.ts
@@ -1,4 +1,5 @@
 export interface UpdateTablePartitioningValues {
+    splitBySize: boolean;
     partitionSizeMb: number;
     minPartitions: number;
     maxPartitions: number;