diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts
index 7d070932f..8b47fb5e7 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts
@@ -23,7 +23,6 @@ export default function buildQuery(formData: QueryFormData) {
   return buildQueryContext(formData, baseQueryObject => [
     {
       ...baseQueryObject,
-      groupby: formData.groupby || [],
       ...(sort_by_metric && { orderby: [[metric, false]] }),
     },
   ]);
diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/buildQuery.test.ts
index 77f1322f9..7eb975daf 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/test/Gauge/buildQuery.test.ts
@@ -29,20 +29,20 @@ describe('Gauge buildQuery', () => {
     const formData = { ...baseFormData, groupby: undefined };
     const queryContext = buildQuery(formData);
     const [query] = queryContext.queries;
-    expect(query.groupby).toEqual([]);
+    expect(query.columns).toEqual([]);
   });
 
   it('should build query fields with single group by column', () => {
     const formData = { ...baseFormData, groupby: ['foo'] };
     const queryContext = buildQuery(formData);
     const [query] = queryContext.queries;
-    expect(query.groupby).toEqual(['foo']);
+    expect(query.columns).toEqual(['foo']);
   });
 
   it('should build query fields with multiple group by columns', () => {
     const formData = { ...baseFormData, groupby: ['foo', 'bar'] };
     const queryContext = buildQuery(formData);
     const [query] = queryContext.queries;
-    expect(query.groupby).toEqual(['foo', 'bar']);
+    expect(query.columns).toEqual(['foo', 'bar']);
   });
 });
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/buildQuery.ts b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/buildQuery.ts
index 3dc7bf87a..c741e6c46 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-handlebars/src/plugin/buildQuery.ts
@@ -23,13 +23,10 @@ import {
 } from '@superset-ui/core';
 
 export default function buildQuery(formData: QueryFormData) {
-  const { groupby } = formData;
-
   return buildQueryContext(formData, baseQueryObject => [
     {
       ...baseQueryObject,
       orderby: normalizeOrderBy(baseQueryObject).orderby,
-      ...(groupby && { groupby }),
     },
   ]);
 }
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/test/plugin/buildQuery.test.ts b/superset-frontend/plugins/plugin-chart-handlebars/test/plugin/buildQuery.test.ts
index 217ee5048..6f84b6afe 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/test/plugin/buildQuery.test.ts
+++ b/superset-frontend/plugins/plugin-chart-handlebars/test/plugin/buildQuery.test.ts
@@ -32,6 +32,6 @@ describe('Handlebars buildQuery', () => {
   it('should build groupby with series in form data', () => {
     const queryContext = buildQuery(formData);
     const [query] = queryContext.queries;
-    expect(query.groupby).toEqual(['foo']);
+    expect(query.columns).toEqual(['foo']);
   });
 });