diff --git a/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsx b/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsx
index ceda8a6a61..360b029a03 100644
--- a/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsx
+++ b/frontend/src/container/QueryBuilder/filters/LimitFilter/LimitFilter.tsx
@@ -1,8 +1,8 @@
-import { InputNumber, Tooltip } from 'antd';
-// import { useMemo } from 'react';
+import { InputNumber } from 'antd';
+import { useMemo } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
+import { DataSource } from 'types/common/queryBuilder';
 
-// import { DataSource } from 'types/common/queryBuilder';
 import { selectStyle } from '../QueryBuilderSearch/config';
 
 function LimitFilter({ onChange, query }: LimitFilterProps): JSX.Element {
@@ -21,25 +21,23 @@ function LimitFilter({ onChange, query }: LimitFilterProps): JSX.Element {
 		}
 	};
 
-	// const isMetricsDataSource = useMemo(
-	// 	() => query.dataSource === DataSource.METRICS,
-	// 	[query.dataSource],
-	// );
+	const isMetricsDataSource = useMemo(
+		() => query.dataSource === DataSource.METRICS,
+		[query.dataSource],
+	);
 
-	// const isDisabled = isMetricsDataSource && !query.aggregateAttribute.key;
+	const isDisabled = isMetricsDataSource && !query.aggregateAttribute.key;
 
 	return (
-		<Tooltip placement="top" title="coming soon">
-			<InputNumber
-				min={1}
-				type="number"
-				readOnly
-				value={query.limit}
-				style={selectStyle}
-				onChange={onChange}
-				onKeyDown={handleKeyDown}
-			/>
-		</Tooltip>
+		<InputNumber
+			min={1}
+			type="number"
+			value={query.limit}
+			style={selectStyle}
+			disabled={isDisabled}
+			onChange={onChange}
+			onKeyDown={handleKeyDown}
+		/>
 	);
 }