diff --git a/lib/SvelteUi/app/src/lib/Clock.svelte b/lib/SvelteUi/app/src/lib/Clock.svelte
index 9418bc50..ddc23062 100644
--- a/lib/SvelteUi/app/src/lib/Clock.svelte
+++ b/lib/SvelteUi/app/src/lib/Clock.svelte
@@ -9,7 +9,7 @@
     $:{
         showFull = Math.abs(new Date().getTime()-timestamp.getTime()) < 300000;
         if(!isNaN(offset))
-            addHours(timestamp, offset - ((timestamp.getHours() - timestamp.getUTCHours())%24));
+            addHours(timestamp, offset - ((24 + timestamp.getHours() - timestamp.getUTCHours())%24));
     }
 </script>
 
diff --git a/lib/SvelteUi/app/src/lib/DayPlot.svelte b/lib/SvelteUi/app/src/lib/DayPlot.svelte
index 86480623..b8bbef26 100644
--- a/lib/SvelteUi/app/src/lib/DayPlot.svelte
+++ b/lib/SvelteUi/app/src/lib/DayPlot.svelte
@@ -17,7 +17,7 @@
         min = max = 0;
         let cur = addHours(new Date(), -24);
         let currentHour = new Date().getUTCHours();
-        addHours(cur, sysinfo.clock_offset - ((cur.getHours() - cur.getUTCHours())%24));
+        addHours(cur, sysinfo.clock_offset - ((24 + cur.getHours() - cur.getUTCHours())%24));
         for(i = currentHour; i<24; i++) {
             let imp = json["i"+zeropad(i)];
             let exp = json["e"+zeropad(i)];
diff --git a/lib/SvelteUi/app/src/lib/MonthPlot.svelte b/lib/SvelteUi/app/src/lib/MonthPlot.svelte
index 9e6682c2..43666d28 100644
--- a/lib/SvelteUi/app/src/lib/MonthPlot.svelte
+++ b/lib/SvelteUi/app/src/lib/MonthPlot.svelte
@@ -17,8 +17,8 @@
         min = max = 0;
         let cur = new Date();
         let lm = new Date();
-        addHours(cur, sysinfo.clock_offset - ((cur.getHours() - cur.getUTCHours())%24));
-        addHours(lm, sysinfo.clock_offset - ((lm.getHours() - lm.getUTCHours())%24));
+        addHours(cur, sysinfo.clock_offset - ((24 + cur.getHours() - cur.getUTCHours())%24));
+        addHours(lm, sysinfo.clock_offset - ((24 + lm.getHours() - lm.getUTCHours())%24));
         lm.setDate(0);
 
         for(i = cur.getDate(); i<=lm.getDate(); i++) {