diff --git a/frontend/src/container/GeneralSettings/index.tsx b/frontend/src/container/GeneralSettings/index.tsx
index b72a7e0320..a38d7e6c81 100644
--- a/frontend/src/container/GeneralSettings/index.tsx
+++ b/frontend/src/container/GeneralSettings/index.tsx
@@ -50,9 +50,17 @@ function GeneralSettings(): JSX.Element {
 	useEffect(() => {
 		if (currentTTLValues) {
 			setMetricsTotalRetentionPeriod(currentTTLValues.metrics_ttl_duration_hrs);
-			setMetricsS3RetentionPeriod(currentTTLValues.metrics_move_ttl_duration_hrs);
+			setMetricsS3RetentionPeriod(
+				currentTTLValues.metrics_move_ttl_duration_hrs
+					? currentTTLValues.metrics_move_ttl_duration_hrs
+					: null,
+			);
 			setTracesTotalRetentionPeriod(currentTTLValues.traces_ttl_duration_hrs);
-			setTracesS3RetentionPeriod(currentTTLValues.traces_move_ttl_duration_hrs);
+			setTracesS3RetentionPeriod(
+				currentTTLValues.traces_move_ttl_duration_hrs
+					? currentTTLValues.traces_move_ttl_duration_hrs
+					: null,
+			);
 		}
 	}, [currentTTLValues]);
 
diff --git a/frontend/src/types/api/settings/getRetention.ts b/frontend/src/types/api/settings/getRetention.ts
index f3ba539416..f8a2f8b1bc 100644
--- a/frontend/src/types/api/settings/getRetention.ts
+++ b/frontend/src/types/api/settings/getRetention.ts
@@ -1,6 +1,6 @@
 export interface PayloadProps {
 	metrics_ttl_duration_hrs: number;
-	metrics_move_ttl_duration_hrs: number;
+	metrics_move_ttl_duration_hrs?: number;
 	traces_ttl_duration_hrs: number;
-	traces_move_ttl_duration_hrs: number;
+	traces_move_ttl_duration_hrs?: number;
 }