diff --git a/addons/survey/static/src/js/survey_result.js b/addons/survey/static/src/js/survey_result.js
index 74f1f24657f..de579632a6d 100644
--- a/addons/survey/static/src/js/survey_result.js
+++ b/addons/survey/static/src/js/survey_result.js
@@ -94,25 +94,27 @@ publicWidget.registry.SurveyResultChart = publicWidget.Widget.extend({
         return this._super.apply(this, arguments).then(function () {
             self.graphData = self.$el.data("graphData");
 
-            switch (self.$el.data("graphType")) {
-                case 'multi_bar':
-                    self.chartConfig = self._getMultibarChartConfig();
-                    break;
-                case 'bar':
-                    self.chartConfig = self._getBarChartConfig();
-                    break;
-                case 'pie':
-                    self.chartConfig = self._getPieChartConfig();
-                    break;
-                case 'doughnut':
-                    self.chartConfig = self._getDoughnutChartConfig();
-                    break;
-                case 'by_section':
-                    self.chartConfig = self._getSectionResultsChartConfig();
-                    break;
-            }
+            if (self.graphData && self.graphData.length !== 0) {
+                switch (self.$el.data("graphType")) {
+                    case 'multi_bar':
+                        self.chartConfig = self._getMultibarChartConfig();
+                        break;
+                    case 'bar':
+                        self.chartConfig = self._getBarChartConfig();
+                        break;
+                    case 'pie':
+                        self.chartConfig = self._getPieChartConfig();
+                        break;
+                    case 'doughnut':
+                        self.chartConfig = self._getDoughnutChartConfig();
+                        break;
+                    case 'by_section':
+                        self.chartConfig = self._getSectionResultsChartConfig();
+                        break;
+                }
 
-            self._loadChart();
+                self._loadChart();
+            }
         });
     },
 
diff --git a/addons/survey/views/survey_templates_statistics.xml b/addons/survey/views/survey_templates_statistics.xml
index 20de2dd74c7..d89659e766b 100644
--- a/addons/survey/views/survey_templates_statistics.xml
+++ b/addons/survey/views/survey_templates_statistics.xml
@@ -352,7 +352,7 @@
             </div>
             <div role="tabpanel" class="tab-pane" t-att-id="'survey_data_question_%d' % question.id">
                 <table class="table table-hover table-sm text-right">
-                    <thead>
+                    <thead t-if="table_data">
                         <tr>
                             <th></th>
                             <th class="text-right" t-foreach="table_data[0]['columns']" t-as="column_data">