diff --git a/app/assets/javascripts/admin/addon/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js
index 9daea4b4a83..9f60e09a257 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report.js
+++ b/app/assets/javascripts/admin/addon/components/admin-report.js
@@ -300,6 +300,7 @@ export default Component.extend({
         return;
       }
     }
+
     if (report.error === "not_found") {
       this.set("showFilteringUI", false);
     }
@@ -382,17 +383,13 @@ export default Component.extend({
       return EmberObject.create(
         Object.assign(tableOptions, this.get("reportOptions.table") || {})
       );
-    } else {
+    } else if (mode === "chart") {
       const chartOptions = JSON.parse(JSON.stringify(CHART_OPTIONS));
-
-      let chartGrouping = this.get("reportOptions.chartGrouping");
-      if (!chartGrouping && report.chartData) {
-        chartGrouping = Report.groupingForDatapoints(report.chartData.length);
-      }
-
       return EmberObject.create(
         Object.assign(chartOptions, this.get("reportOptions.chart") || {}, {
-          chartGrouping,
+          chartGrouping:
+            this.get("reportOptions.chartGrouping") ||
+            Report.groupingForDatapoints(report.chartData.length),
         })
       );
     }