diff --git a/webapp/src/components/BarChart.vue b/webapp/src/components/BarChart.vue
index 7b3b2b7d..77b9b16e 100644
--- a/webapp/src/components/BarChart.vue
+++ b/webapp/src/components/BarChart.vue
@@ -51,19 +51,18 @@ export default defineComponent({
     },
     methods: {
         drawChart() {
-            var end = new Date()
-            var start = new Date()
+            var end = new Date();
+            var start = new Date();
             var interval = 1    // number of days to show in the chart
-            start.setDate(end.getDate() - interval)
-            start.setHours(start.getHours() - 2)
-            const energy = this.dataBase.values
-            var old_energy = energy[0][4]
+            const energy = this.dataBase.values;
+            var old_energy = 0.0;
+            start.setDate(end.getDate() - interval);
+            start.setHours(start.getHours() - 2);
             data = [['Time', 'Energy']];
             energy.forEach((x: any[]) => {
-                var d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3])
+                var d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3]);
                 if ((d >= start) && (d <= end)) {
-                    var a = [d, (x[4] - old_energy) * 1000]
-                    data.push(a)
+                    data.push([d, (x[4] - old_energy) * 1000])
                 }
                 old_energy = x[4]
             })
diff --git a/webapp/src/components/CalendarChart.vue b/webapp/src/components/CalendarChart.vue
index 5aa03c15..2cb77bb2 100644
--- a/webapp/src/components/CalendarChart.vue
+++ b/webapp/src/components/CalendarChart.vue
@@ -59,17 +59,22 @@ export default defineComponent({
                 type: 'number',
                 id: 'Energy'
             }]]
-            var d: Date
-            var a: any
-            const energy = this.dataBase.values
-            var old_energy = energy[0][4]
-            var old_day = energy[0][2]
-            var last_energy: number
+            var d: Date;
+            var a: any;
+            const energy = this.dataBase.values;
+            var old_energy = 0.0;
+            var last_energy = 0.0;
+            var old_day = -1;
             energy.forEach((x: any[]) => {
-                if (x[2] != old_day) {
-                    data.push(a)
-                    old_day = x[2]
-                    old_energy = last_energy
+                if (old_day < 0) {
+                    old_day = x[2];
+                    old_energy = x[4];
+                } else {
+                    if (x[2] != old_day) {
+                        data.push(a)
+                        old_day = x[2]
+                        old_energy = last_energy
+                    }
                 }
                 last_energy = x[4]
                 d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3])
diff --git a/webapp_dist/js/app.js.gz b/webapp_dist/js/app.js.gz
index 3548b717..c7c61faf 100644
Binary files a/webapp_dist/js/app.js.gz and b/webapp_dist/js/app.js.gz differ