diff --git a/frontend/src/components/Doughnut.vue b/frontend/src/components/Doughnut.vue
index a34b65228f9898d5cd61fa403a43d0cfa7bcbeb0..3ee2973d9444c7fcddc4b5d2ee6c11669fb71415 100644
--- a/frontend/src/components/Doughnut.vue
+++ b/frontend/src/components/Doughnut.vue
@@ -58,21 +58,6 @@ export default {
       noGraph: true,
     }
   },
-  watch: {
-    doughnutData(val) {
-      if (this.noGraph) {
-        this.noGraph = false;
-        this.createChart();
-      }
-      this.updateChart();
-    },
-    hideLegend(val) {
-      this.updateChartOptions();
-    },
-    hideLabels() {
-      this.updateChartData();
-    }
-  },
   computed: {
     hideLabelsLabel() {
       if (Object.entries(this.doughnutData).length == 0) {
@@ -138,5 +123,20 @@ export default {
       this.myChart.update();
     },
   },
+  watch: {
+    doughnutData(val) {
+      if (this.noGraph) {
+        this.noGraph = false;
+        this.createChart();
+      }
+      this.updateChart();
+    },
+    hideLegend(val) {
+      this.updateChartOptions();
+    },
+    hideLabels() {
+      this.updateChartData();
+    }
+  },
 };
 </script>
diff --git a/frontend/src/components/Histogram.vue b/frontend/src/components/Histogram.vue
index a367a4160d865dacd21d06ddf61095ead26c1a74..6de05074bf2949e0873010bc8f00e05b401347bf 100644
--- a/frontend/src/components/Histogram.vue
+++ b/frontend/src/components/Histogram.vue
@@ -32,15 +32,6 @@ export default {
       noGraph: true,
     }
   },
-  watch: {
-    histoData(val) {
-      if (this.noGraph) {
-        this.noGraph = false;
-        this.createChart();
-      }
-      this.updateChart();
-    },
-  },
   methods: {
     createChart() {
       const ctx = document.getElementById(this.chartId);
@@ -66,5 +57,14 @@ export default {
       this.myChart.update();
     },
   },
+  watch: {
+    histoData(val) {
+      if (this.noGraph) {
+        this.noGraph = false;
+        this.createChart();
+      }
+      this.updateChart();
+    },
+  },
 };
 </script>