diff --git a/frontend/src/container/QueryBuilder/components/Query/Query.tsx b/frontend/src/container/QueryBuilder/components/Query/Query.tsx
index f1ce6aeaa8..71ea070e67 100644
--- a/frontend/src/container/QueryBuilder/components/Query/Query.tsx
+++ b/frontend/src/container/QueryBuilder/components/Query/Query.tsx
@@ -458,6 +458,7 @@ export const Query = memo(function Query({
 												query={query}
 												onChange={handleChangeTagFilters}
 												whereClauseConfig={filterConfigs?.filters}
+												hideSpanScopeSelector={query.dataSource !== DataSource.TRACES}
 											/>
 										) : (
 											<QueryBuilderSearch
diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
index 1c0cc87704..8a7d489781 100644
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
@@ -92,6 +92,7 @@ interface QueryBuilderSearchV2Props {
 	suffixIcon?: React.ReactNode;
 	hardcodedAttributeKeys?: BaseAutocompleteData[];
 	operatorConfigKey?: OperatorConfigKeys;
+	hideSpanScopeSelector?: boolean;
 }
 
 export interface Option {
@@ -126,6 +127,7 @@ function QueryBuilderSearchV2(
 		whereClauseConfig,
 		hardcodedAttributeKeys,
 		operatorConfigKey,
+		hideSpanScopeSelector,
 	} = props;
 
 	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();
@@ -936,11 +938,6 @@ function QueryBuilderSearchV2(
 		);
 	};
 
-	const isTracesDataSource = useMemo(
-		() => query.dataSource === DataSource.TRACES,
-		[query.dataSource],
-	);
-
 	return (
 		<div className="query-builder-search-v2">
 			<Select
@@ -1025,7 +1022,7 @@ function QueryBuilderSearchV2(
 					);
 				})}
 			</Select>
-			{isTracesDataSource && <SpanScopeSelector queryName={query.queryName} />}
+			{!hideSpanScopeSelector && <SpanScopeSelector queryName={query.queryName} />}
 		</div>
 	);
 }
@@ -1037,6 +1034,7 @@ QueryBuilderSearchV2.defaultProps = {
 	whereClauseConfig: {},
 	hardcodedAttributeKeys: undefined,
 	operatorConfigKey: undefined,
+	hideSpanScopeSelector: true,
 };
 
 export default QueryBuilderSearchV2;
diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx
index 1227c7f191..d9b2d18462 100644
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx
@@ -26,7 +26,7 @@ const queryClient = new QueryClient({
 });
 
 describe('Span scope selector', () => {
-	it('should render span scope selector when data source is TRACES', () => {
+	it('should render span scope selector when hideSpanScopeSelector is false', () => {
 		const { getByTestId } = render(
 			<QueryClientProvider client={queryClient}>
 				<QueryBuilderSearchV2
@@ -34,6 +34,7 @@ describe('Span scope selector', () => {
 						...initialQueryBuilderFormValues,
 						dataSource: DataSource.TRACES,
 					}}
+					hideSpanScopeSelector={false}
 					onChange={jest.fn()}
 				/>
 			</QueryClientProvider>,
@@ -42,7 +43,7 @@ describe('Span scope selector', () => {
 		expect(getByTestId('span-scope-selector')).toBeInTheDocument();
 	});
 
-	it('should not render span scope selector for non-TRACES data sources', () => {
+	it('should not render span scope selector by default (i.e. when hideSpanScopeSelector is true)', () => {
 		const { queryByTestId } = render(
 			<QueryClientProvider client={queryClient}>
 				<QueryBuilderSearchV2
diff --git a/frontend/src/container/ResourceAttributeFilterV2/ResourceAttributesFilterV2.tsx b/frontend/src/container/ResourceAttributeFilterV2/ResourceAttributesFilterV2.tsx
index 80dc3136a5..3a0be5d24e 100644
--- a/frontend/src/container/ResourceAttributeFilterV2/ResourceAttributesFilterV2.tsx
+++ b/frontend/src/container/ResourceAttributeFilterV2/ResourceAttributesFilterV2.tsx
@@ -52,6 +52,7 @@ function ResourceAttributesFilter(): JSX.Element | null {
 				query={query}
 				onChange={handleChangeTagFilters}
 				operatorConfigKey={OperatorConfigKeys.EXCEPTIONS}
+				hideSpanScopeSelector={false}
 			/>
 		</div>
 	);