diff --git a/ui/src/utils/groupBy.js b/ui/src/utils/groupBy.js
index ff6cd898e5..6513c5ee63 100644
--- a/ui/src/utils/groupBy.js
+++ b/ui/src/utils/groupBy.js
@@ -42,7 +42,7 @@ const constructResults = (raw, groupBys) => {
 
       const successfulResults = _.filter(results, r => _.isNil(r.error))
 
-      if (groupBys[index]) {
+      if (!_.isEmpty(groupBys[index])) {
         return groupByMap(successfulResults, index, groupBys[index])
       }
       return map(successfulResults, r => ({...r, responseIndex: index}))
@@ -137,7 +137,7 @@ const insertGroupByValues = (
   const timeSeries = []
   let existingRowIndex
   forEach(serieses, (s, sind) => {
-    if (groupBys[s.responseIndex]) {
+    if (!_.isEmpty(groupBys[s.responseIndex])) {
       forEach(s.values, vs => {
         timeSeries.push({time: vs[0], values: clone(dashArray)})
         existingRowIndex = timeSeries.length - 1
@@ -193,7 +193,7 @@ const constructTimeSeries = (
     const seriesIndex = cells.seriesIndex[i]
     const responseIndex = cells.responseIndex[i]
 
-    if (groupBys[cells.responseIndex[i]]) {
+    if (!_.isEmpty(groupBys[cells.responseIndex[i]])) {
       // we've already inserted GroupByValues
       continue
     }
@@ -225,7 +225,7 @@ const constructTimeSeries = (
 
 export const groupByTimeSeriesTransform = (raw, groupBys) => {
   if (!groupBys) {
-    groupBys = Array(raw.length).fill(false)
+    groupBys = Array(raw.length).fill([])
   }
 
   const results = constructResults(raw, groupBys)
diff --git a/ui/src/utils/timeSeriesTransformers.js b/ui/src/utils/timeSeriesTransformers.js
index 0ee22c8e7b..a78ba487a7 100644
--- a/ui/src/utils/timeSeriesTransformers.js
+++ b/ui/src/utils/timeSeriesTransformers.js
@@ -30,7 +30,7 @@ export const timeSeriesToDygraph = (raw = [], isInDataExplorer) => {
 
 const computeGroupBys = queryASTs => {
   return queryASTs.map(queryAST => {
-    return _.get(queryAST, ['groupBy', 'tags'], false)
+    return _.get(queryAST, ['groupBy', 'tags'], [])
   })
 }