diff --git a/libs/pages/database/src/lib/ui/page-settings-resources/page-settings-resources.tsx b/libs/pages/database/src/lib/ui/page-settings-resources/page-settings-resources.tsx
index cc293380da0..c1ad62051f5 100644
--- a/libs/pages/database/src/lib/ui/page-settings-resources/page-settings-resources.tsx
+++ b/libs/pages/database/src/lib/ui/page-settings-resources/page-settings-resources.tsx
@@ -22,7 +22,11 @@ export function PageSettingsResources(props: PageSettingsResourcesProps) {
const displayInstanceTypesWarning =
watch('instance_type') !== database.instance_type && database.mode === DatabaseModeEnum.MANAGED
- const displayStorageWarning = watch('storage') !== database.storage && database.mode === DatabaseModeEnum.MANAGED
+ // Storage warning should not be displayed for Redis managed databases (ElastiCache) as storage is determined by node type
+ const displayStorageWarning =
+ watch('storage') !== database.storage &&
+ database.mode === DatabaseModeEnum.MANAGED &&
+ database.type !== 'REDIS'
return (
diff --git a/libs/shared/console-shared/src/lib/database-settings-resources/ui/database-settings-resources/database-settings-resources.tsx b/libs/shared/console-shared/src/lib/database-settings-resources/ui/database-settings-resources/database-settings-resources.tsx
index f04e963b0cb..c372c1cd7df 100644
--- a/libs/shared/console-shared/src/lib/database-settings-resources/ui/database-settings-resources/database-settings-resources.tsx
+++ b/libs/shared/console-shared/src/lib/database-settings-resources/ui/database-settings-resources/database-settings-resources.tsx
@@ -152,29 +152,39 @@ export function DatabaseSettingsResources({
isSetting={isSetting}
/>
)}
+ {/* Storage is not configurable for Redis managed databases (ElastiCache) - capacity is determined by node type */}
(
-
- )}
+ rules={
+ isManaged && databaseType === 'REDIS'
+ ? undefined
+ : {
+ pattern: {
+ value: /^[0-9]+$/,
+ message: 'Please enter a number.',
+ },
+ min: {
+ value: minStorageValue,
+ message: `Storage must be at least ${minStorageValue} GiB.`,
+ },
+ }
+ }
+ render={({ field, fieldState: { error } }) =>
+ isManaged && databaseType === 'REDIS' ? (
+ // Hidden field to preserve storage value for Redis managed, but it's not used by ElastiCache
+
+ ) : (
+
+ )
+ }
/>
{displayStorageWarning && (