diff --git a/frontend/src/container/GeneralSettings/Retention.tsx b/frontend/src/container/GeneralSettings/Retention.tsx
index e6cef0383d..03af1aeb5e 100644
--- a/frontend/src/container/GeneralSettings/Retention.tsx
+++ b/frontend/src/container/GeneralSettings/Retention.tsx
@@ -1,12 +1,10 @@
-import { DownOutlined } from '@ant-design/icons';
-import { Button, Col, Menu, Row, Select } from 'antd';
+import { Col, Row, Select } from 'antd';
 import { find } from 'lodash-es';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
-import { Dropdown, Input, RetentionContainer, Typography } from './styles';
+import { Input, RetentionContainer, Typography } from './styles';
 import {
 	convertHoursValueToRelevantUnit,
-	ITimeUnit,
 	SettingPeriod,
 	TimeUnits,
 } from './utils';
@@ -18,24 +16,22 @@ function Retention({
 	setRetentionValue,
 	text,
 	hide,
-}: RetentionProps): JSX.Element {
+}: RetentionProps): JSX.Element | null {
 	const {
 		value: initialValue,
 		timeUnitValue: initialTimeUnitValue,
-	} = convertHoursValueToRelevantUnit(retentionValue);
+	} = convertHoursValueToRelevantUnit(Number(retentionValue));
 	const [selectedTimeUnit, setSelectTimeUnit] = useState(initialTimeUnitValue);
 	const [selectedValue, setSelectedValue] = useState<number | null>(null);
-
+	const interacted = useRef(false);
 	useEffect(() => {
-		setSelectedValue(initialValue);
+		if (!interacted.current) setSelectedValue(initialValue);
 	}, [initialValue]);
 
-
 	useEffect(() => {
-		setSelectTimeUnit(initialTimeUnitValue);
+		if (!interacted.current) setSelectTimeUnit(initialTimeUnitValue);
 	}, [initialTimeUnitValue]);
 
-
 	const menuItems = TimeUnits.map((option) => (
 		<Option key={option.value} value={option.value}>
 			{option.key}
@@ -62,6 +58,7 @@ function Retention({
 		e: React.ChangeEvent<HTMLInputElement>,
 		func: React.Dispatch<React.SetStateAction<number | null>>,
 	): void => {
+		interacted.current = true;
 		const { value } = e.target;
 		const integerValue = parseInt(value, 10);
 
@@ -93,7 +90,7 @@ function Retention({
 				<Col flex="150px">
 					<div style={{ display: 'inline-flex' }}>
 						<Input
-							value={selectedValue >= 0 ? selectedValue : ''}
+							value={selectedValue && selectedValue >= 0 ? selectedValue : ''}
 							onChange={(e): void => onChangeHandler(e, setSelectedValue)}
 							style={{ width: 75 }}
 						/>
diff --git a/frontend/src/container/GeneralSettings/index.tsx b/frontend/src/container/GeneralSettings/index.tsx
index fa1a04dd56..b72a7e0320 100644
--- a/frontend/src/container/GeneralSettings/index.tsx
+++ b/frontend/src/container/GeneralSettings/index.tsx
@@ -5,8 +5,6 @@ import setRetentionApi from 'api/settings/setRetention';
 import Spinner from 'components/Spinner';
 import TextToolTip from 'components/TextToolTip';
 import useFetch from 'hooks/useFetch';
-import convertIntoHr from 'lib/convertIntoHr';
-import getSettingsPeroid from 'lib/getSettingsPeroid';
 import { find } from 'lodash-es';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { IDiskType } from 'types/api/disks/getDisks';
@@ -21,19 +19,12 @@ import {
 } from './styles';
 
 function GeneralSettings(): JSX.Element {
-	const [
-		selectedMetricsPeroid,
-		setSelectedMetricsPeroid,
-	] = useState<SettingPeriod>('month');
 	const [notifications, Element] = notification.useNotification();
 
 	const [modal, setModal] = useState<boolean>(false);
 	const [postApiLoading, setPostApiLoading] = useState<boolean>(false);
 
-	const [isDefaultMetrics, setIsDefaultMetrics] = useState<boolean>(false);
-	const [isDefaultTrace, setIsDefaultTrace] = useState<boolean>(false);
-
-	const [availableDisks, setAvailableDisks] = useState<IDiskType | null>(null);
+	const [availableDisks, setAvailableDisks] = useState<IDiskType[] | null>(null);
 
 	useEffect(() => {
 		getDisks().then((response) => setAvailableDisks(response.payload));
@@ -62,7 +53,6 @@ function GeneralSettings(): JSX.Element {
 			setMetricsS3RetentionPeriod(currentTTLValues.metrics_move_ttl_duration_hrs);
 			setTracesTotalRetentionPeriod(currentTTLValues.traces_ttl_duration_hrs);
 			setTracesS3RetentionPeriod(currentTTLValues.traces_move_ttl_duration_hrs);
-			console.log({ currentTTLValues });
 		}
 	}, [currentTTLValues]);
 
@@ -74,20 +64,6 @@ function GeneralSettings(): JSX.Element {
 		onModalToggleHandler();
 	}, []);
 
-	const checkMetricTraceDefault = (trace: number, metric: number): void => {
-		if (metric === -1) {
-			setIsDefaultMetrics(true);
-		} else {
-			setIsDefaultMetrics(false);
-		}
-
-		if (trace === -1) {
-			setIsDefaultTrace(true);
-		} else {
-			setIsDefaultTrace(false);
-		}
-	};
-	// const retentionRenderConfig = () => { };
 	const s3Enabled = useMemo(
 		() => !!find(availableDisks, (disks: IDiskType) => disks?.type === 's3'),
 		[availableDisks],
@@ -153,15 +129,6 @@ function GeneralSettings(): JSX.Element {
 	const onOkHandler = async (): Promise<void> => {
 		try {
 			setPostApiLoading(true);
-			// const retentionTraceValue =
-			// 	retentionPeroidTrace === '0' && (payload?.traces_ttl_duration_hrs || 0) < 0
-			// 		? payload?.traces_ttl_duration_hrs || 0
-			// 		: parseInt(retentionPeroidTrace, 10);
-			// const retentionMetricsValue =
-			// 	retentionPeroidMetrics === '0' &&
-			// 		(payload?.metrics_ttl_duration_hrs || 0) < 0
-			// 		? payload?.metrics_ttl_duration_hrs || 0
-			// 		: parseInt(retentionPeroidMetrics, 10);
 			const [metricsTTLApiResponse, tracesTTLApiResponse] = await Promise.all([
 				setRetentionApi({
 					type: 'metrics',
@@ -192,8 +159,6 @@ function GeneralSettings(): JSX.Element {
 						placement: 'topRight',
 						description: `Congrats. The retention periods for ${name} has been updated successfully.`,
 					});
-					// checkMetricTraceDefault(retentionTraceValue, retentionMetricsValue);
-					onModalToggleHandler();
 				} else {
 					notifications.error({
 						message: 'Error',
@@ -202,6 +167,7 @@ function GeneralSettings(): JSX.Element {
 					});
 				}
 			});
+			onModalToggleHandler();
 			setPostApiLoading(false);
 		} catch (error) {
 			notifications.error({
@@ -294,32 +260,7 @@ function GeneralSettings(): JSX.Element {
 					/>
 				</ToolTipContainer>
 			)}
-			<Row justify="space-around" style={{ gap: '4%' }}>
-				{/* {renderConfig.map((category): JSX.Element | null => {
-					if (
-						Array.isArray(category.retentionFields) &&
-						category.retentionFields.length > 0
-					) {
-						return (
-							<Col flex="40%" style={{ minWidth: 475 }} key={category.name}>
-								<Typography.Title level={3}>{category.name}</Typography.Title>
-
-								{category.retentionFields.map((retentionField) => (
-									<Retention
-										key={retentionField.name}
-										text={retentionField.name}
-										retentionValue={retentionField.value}
-										setRetentionValue={retentionField.setValue}
-										hide={!!retentionField.hide}
-									/>
-								))}
-							</Col>
-						);
-					}
-					return null;
-				})} */}
-				{renderConfig}
-			</Row>
+			<Row justify="space-around">{renderConfig}</Row>
 
 			<Modal
 				title="Are you sure you want to change the retention period?"
diff --git a/frontend/src/container/GeneralSettings/utils.ts b/frontend/src/container/GeneralSettings/utils.ts
index caf0502d85..30efd6786a 100644
--- a/frontend/src/container/GeneralSettings/utils.ts
+++ b/frontend/src/container/GeneralSettings/utils.ts
@@ -26,16 +26,17 @@ export const TimeUnits: ITimeUnit[] = [
 export const convertHoursValueToRelevantUnit = (
 	value: number,
 ): { value: number; timeUnitValue: SettingPeriod } => {
-	for (let idx = TimeUnits.length - 1; idx >= 0; idx -= 1) {
-		const timeUnit = TimeUnits[idx];
-		const convertedValue = timeUnit.multiplier * value;
+	if (value)
+		for (let idx = TimeUnits.length - 1; idx >= 0; idx -= 1) {
+			const timeUnit = TimeUnits[idx];
+			const convertedValue = timeUnit.multiplier * value;
 
-		if (
-			convertedValue >= 1 &&
-			convertedValue === parseInt(`${convertedValue}`, 10)
-		) {
-			return { value: convertedValue, timeUnitValue: timeUnit.value };
+			if (
+				convertedValue >= 1 &&
+				convertedValue === parseInt(`${convertedValue}`, 10)
+			) {
+				return { value: convertedValue, timeUnitValue: timeUnit.value };
+			}
 		}
-	}
 	return { value, timeUnitValue: TimeUnits[0].value };
 };
diff --git a/frontend/src/pages/AlertChannelCreate/index.tsx b/frontend/src/pages/AlertChannelCreate/index.tsx
index 1f316fe860..3de6ce9986 100644
--- a/frontend/src/pages/AlertChannelCreate/index.tsx
+++ b/frontend/src/pages/AlertChannelCreate/index.tsx
@@ -26,8 +26,7 @@ function SettingsPage(): JSX.Element {
 						route: ROUTES.ALL_CHANNELS,
 					},
 				],
-				activeKey:
-					pathName === ROUTES.SETTINGS ? 'General' : 'Alert Channels',
+				activeKey: pathName === ROUTES.SETTINGS ? 'General' : 'Alert Channels',
 			}}
 		/>
 	);
diff --git a/frontend/src/pages/Settings/index.tsx b/frontend/src/pages/Settings/index.tsx
index 2b23cec2ec..208fcde7c1 100644
--- a/frontend/src/pages/Settings/index.tsx
+++ b/frontend/src/pages/Settings/index.tsx
@@ -23,8 +23,7 @@ function SettingsPage(): JSX.Element {
 						route: ROUTES.ALL_CHANNELS,
 					},
 				],
-				activeKey:
-					pathName === ROUTES.ALL_CHANNELS ? 'Alert Channels' : 'General',
+				activeKey: pathName === ROUTES.ALL_CHANNELS ? 'Alert Channels' : 'General',
 			}}
 		/>
 	);