diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
index 0bb83fa414a84..57839ebc2cf76 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
@@ -190,7 +190,7 @@ describe('Dashboard edit action', () => {
       });
     });
   });
-  describe('the color scheme affects the chart colors', () => {
+  describe.skip('the color scheme affects the chart colors', () => {
     it('should change the chart colors', () => {
       openAdvancedProperties().then(() => {
         clear('#json_metadata');
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 7ac5675e6ecd2..b9ffb4792cfab 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -1410,7 +1410,9 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                         col=selected, template_processor=template_processor
                     )
                 groupby_all_columns[outer.name] = outer
-                if not series_column_names or outer.name in series_column_names:
+                if (
+                    is_timeseries and not series_column_names
+                ) or outer.name in series_column_names:
                     groupby_series_columns[outer.name] = outer
                 select_exprs.append(outer)
         elif columns:
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index 1ce534b593d01..a476fa0c8106d 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -1515,7 +1515,9 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                         col=selected, template_processor=template_processor
                     )
                 groupby_all_columns[outer.name] = outer
-                if not series_column_names or outer.name in series_column_names:
+                if (
+                    is_timeseries and not series_column_names
+                ) or outer.name in series_column_names:
                     groupby_series_columns[outer.name] = outer
                 select_exprs.append(outer)
         elif columns: