diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
index ad9887055aa..73e002b87c8 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
@@ -82,4 +82,41 @@ describe('QueryEditor', () => {
       expect(screen.getByLabelText('Alias')).toBeEnabled();
     });
   });
+
+  it('Should NOT show Bucket Aggregations Editor if query contains a "singleMetric" metric', () => {
+    const query: ElasticsearchQuery = {
+      refId: 'A',
+      query: '',
+      metrics: [
+        {
+          id: '1',
+          type: 'logs',
+        },
+      ],
+      // Even if present, this shouldn't be shown in the UI
+      bucketAggs: [{ id: '2', type: 'date_histogram' }],
+    };
+
+    render(<QueryEditor query={query} datasource={{} as ElasticDatasource} onChange={noop} onRunQuery={noop} />);
+
+    expect(screen.queryByLabelText('Group By')).not.toBeInTheDocument();
+  });
+
+  it('Should show Bucket Aggregations Editor if query does NOT contains a "singleMetric" metric', () => {
+    const query: ElasticsearchQuery = {
+      refId: 'A',
+      query: '',
+      metrics: [
+        {
+          id: '1',
+          type: 'avg',
+        },
+      ],
+      bucketAggs: [{ id: '2', type: 'date_histogram' }],
+    };
+
+    render(<QueryEditor query={query} datasource={{} as ElasticDatasource} onChange={noop} onRunQuery={noop} />);
+
+    expect(screen.getByText('Group By')).toBeInTheDocument();
+  });
 });
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
index 2ef0c72a172..fcf25e8cb76 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
@@ -9,6 +9,7 @@ import { MetricAggregationsEditor } from './MetricAggregationsEditor';
 import { BucketAggregationsEditor } from './BucketAggregationsEditor';
 import { useDispatch } from '../../hooks/useStatelessReducer';
 import { useNextId } from '../../hooks/useNextId';
+import { metricAggregationConfig } from './MetricAggregationsEditor/utils';
 
 export type ElasticQueryEditorProps = QueryEditorProps<ElasticDatasource, ElasticsearchQuery, ElasticsearchOptions>;
 
@@ -35,6 +36,10 @@ const QueryEditorForm = ({ value }: Props) => {
   // To be considered a time series query, the last bucked aggregation must be a Date Histogram
   const isTimeSeriesQuery = value.bucketAggs?.slice(-1)[0]?.type === 'date_histogram';
 
+  const showBucketAggregationsEditor = value.metrics?.every(
+    (metric) => !metricAggregationConfig[metric.type].isSingleMetric
+  );
+
   return (
     <>
       <InlineFieldRow>
@@ -65,7 +70,7 @@ const QueryEditorForm = ({ value }: Props) => {
       </InlineFieldRow>
 
       <MetricAggregationsEditor nextId={nextId} />
-      <BucketAggregationsEditor nextId={nextId} />
+      {showBucketAggregationsEditor && <BucketAggregationsEditor nextId={nextId} />}
     </>
   );
 };
diff --git a/public/app/plugins/datasource/elasticsearch/language_provider.test.ts b/public/app/plugins/datasource/elasticsearch/language_provider.test.ts
index 9800ac8d1bb..d051cf92340 100644
--- a/public/app/plugins/datasource/elasticsearch/language_provider.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/language_provider.test.ts
@@ -4,8 +4,6 @@ import { ElasticDatasource } from './datasource';
 import { DataSourceInstanceSettings } from '@grafana/data';
 import { ElasticsearchOptions, ElasticsearchQuery } from './types';
 import { TemplateSrv } from '../../../features/templating/template_srv';
-import { defaultBucketAgg } from './query_def';
-import { DateHistogram } from './components/QueryEditor/BucketAggregationsEditor/aggregations';
 
 const templateSrvStub = {
   getAdhocFilters: jest.fn(() => [] as any[]),
@@ -27,7 +25,6 @@ const dataSource = new ElasticDatasource(
 
 const baseLogsQuery: Partial<ElasticsearchQuery> = {
   metrics: [{ type: 'logs', id: '1' }],
-  bucketAggs: [{ ...defaultBucketAgg('2'), field: dataSource.timeField } as DateHistogram],
 };
 
 describe('transform prometheus query to elasticsearch query', () => {
diff --git a/public/app/plugins/datasource/elasticsearch/language_provider.ts b/public/app/plugins/datasource/elasticsearch/language_provider.ts
index ea25957cdb4..472cdbd5c54 100644
--- a/public/app/plugins/datasource/elasticsearch/language_provider.ts
+++ b/public/app/plugins/datasource/elasticsearch/language_provider.ts
@@ -7,7 +7,6 @@ import { PromQuery } from '../prometheus/types';
 
 import Prism, { Token } from 'prismjs';
 import grammar from '../prometheus/promql';
-import { defaultBucketAgg } from './query_def';
 
 function getNameLabelValue(promQuery: string, tokens: any): string {
   let nameLabelValue = '';
@@ -122,7 +121,6 @@ export default class ElasticsearchLanguageProvider extends LanguageProvider {
               type: 'logs',
             },
           ],
-          bucketAggs: [{ ...defaultBucketAgg('2'), field: this.datasource.timeField }],
           query: expr,
           refId: query.refId,
         };