diff --git a/page/src/app.hooks.js b/page/src/app.hooks.js
index 8966c1e4e4..dc0e8aca12 100644
--- a/page/src/app.hooks.js
+++ b/page/src/app.hooks.js
@@ -114,12 +114,12 @@ export const useDayEvents = (monthEvents, day = null) => {
       result = result.filter((e) => {
         let retval = false
 
-        if (e.date[0]) {
+        if (e.date[0] && e.date[1] == null) {
           const startDate = new Date(e.date[0])
           retval = startDate.getDate() === filterDay.getDate()
         }
 
-        if (e.date[1]) {
+        if (e.date[1] && e.date[0] == null) {
           const endDate = new Date(e.date[1])
           retval = retval || endDate.getDate() === filterDay.getDate()
         }
diff --git a/page/src/components/CalendarGrid/CalendarGrid.jsx b/page/src/components/CalendarGrid/CalendarGrid.jsx
index 6b1f03f41a..1badd442cf 100644
--- a/page/src/components/CalendarGrid/CalendarGrid.jsx
+++ b/page/src/components/CalendarGrid/CalendarGrid.jsx
@@ -12,7 +12,7 @@ const CalendarGrid = ({year}) => {
       const days = [];
       const nbDays = new Date(year, m + 1, 0).getDate();
       for (let i = 1; i <= nbDays; i++) {
-        days.push(new Date(year, m, i));
+        days.push(new Date(Date.UTC(year, m, i)));
       }
       months.push({month: m, days});
     }