diff --git a/frontend/src/container/QueryBuilder/components/Query/Query.tsx b/frontend/src/container/QueryBuilder/components/Query/Query.tsx
index 7f8b4c1cdc..9f4fca9b12 100644
--- a/frontend/src/container/QueryBuilder/components/Query/Query.tsx
+++ b/frontend/src/container/QueryBuilder/components/Query/Query.tsx
@@ -210,16 +210,19 @@ export const Query = memo(function Query({
 			default: {
 				return (
 					<>
-						<Col span={11}>
-							<Row gutter={[11, 5]}>
-								<Col flex="5.93rem">
-									<FilterLabel label="Limit" />
-								</Col>
-								<Col flex="1 1 12.5rem">
-									<LimitFilter query={query} onChange={handleChangeLimit} />
-								</Col>
-							</Row>
-						</Col>
+						{!filterConfigs?.limit?.isHidden && (
+							<Col span={11}>
+								<Row gutter={[11, 5]}>
+									<Col flex="5.93rem">
+										<FilterLabel label="Limit" />
+									</Col>
+									<Col flex="1 1 12.5rem">
+										<LimitFilter query={query} onChange={handleChangeLimit} />
+									</Col>
+								</Row>
+							</Col>
+						)}
+
 						{!filterConfigs?.having?.isHidden && (
 							<Col span={11}>
 								<Row gutter={[11, 5]}>
@@ -232,7 +235,6 @@ export const Query = memo(function Query({
 								</Row>
 							</Col>
 						)}
-
 						<Col span={11}>
 							<Row gutter={[11, 5]}>
 								<Col flex="5.93rem">
@@ -251,6 +253,7 @@ export const Query = memo(function Query({
 		panelType,
 		isMetricsDataSource,
 		query,
+		filterConfigs?.limit?.isHidden,
 		filterConfigs?.having?.isHidden,
 		handleChangeLimit,
 		handleChangeHavingFilter,
diff --git a/frontend/src/container/TracesExplorer/QuerySection/index.tsx b/frontend/src/container/TracesExplorer/QuerySection/index.tsx
index 80f2925b37..279f57b5df 100644
--- a/frontend/src/container/TracesExplorer/QuerySection/index.tsx
+++ b/frontend/src/container/TracesExplorer/QuerySection/index.tsx
@@ -20,6 +20,7 @@ function QuerySection(): JSX.Element {
 		const isList = panelTypes === PANEL_TYPES.LIST;
 		const config: QueryBuilderProps['filterConfigs'] = {
 			stepInterval: { isHidden: false, isDisabled: true },
+			limit: { isHidden: isList, isDisabled: true },
 			having: { isHidden: isList, isDisabled: true },
 		};
 
diff --git a/frontend/src/hooks/queryBuilder/useQueryOperations.ts b/frontend/src/hooks/queryBuilder/useQueryOperations.ts
index 8e0251d0b5..0d2f8f0cf2 100644
--- a/frontend/src/hooks/queryBuilder/useQueryOperations.ts
+++ b/frontend/src/hooks/queryBuilder/useQueryOperations.ts
@@ -152,7 +152,6 @@ export const useQueryOperations: UseQueryOperations = ({
 		() => query.dataSource === DataSource.METRICS,
 		[query.dataSource],
 	);
-
 	const isTracePanelType = useMemo(() => panelType === PANEL_TYPES.TRACE, [
 		panelType,
 	]);