diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/buildQuery.ts
index cf0f28c72f5..c66ac472706 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/buildQuery.ts
+++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/buildQuery.ts
@@ -126,6 +126,11 @@ const buildQuery: BuildQuery<TableChartFormData> = (formData: TableChartFormData
       });
     }
 
+    const interactiveGroupBy = formData.extra_form_data?.interactive_groupby;
+    if (interactiveGroupBy && queryObject.columns && queryMode === QueryMode.aggregate) {
+      queryObject.columns = [...new Set([...queryObject.columns, ...interactiveGroupBy])];
+    }
+
     if (formData.server_pagination) {
       return [
         { ...queryObject },
@@ -134,11 +139,6 @@ const buildQuery: BuildQuery<TableChartFormData> = (formData: TableChartFormData
       ];
     }
 
-    const interactiveGroupBy = formData.extra_form_data?.interactive_groupby;
-    if (interactiveGroupBy && queryObject.columns) {
-      queryObject.columns = [...new Set([...queryObject.columns, ...interactiveGroupBy])];
-    }
-
     return [queryObject, ...extraQueries];
   });
 };