diff --git a/assets/src/js/components/Chart.js b/assets/src/js/components/Chart.js
index accc378..7475baa 100644
--- a/assets/src/js/components/Chart.js
+++ b/assets/src/js/components/Chart.js
@@ -52,9 +52,9 @@ function timeFormatPicker(n) {
 
 function prepareData(startUnix, endUnix, data) {
   // add timezone offset back in to get local start date
-  const timezoneOffset = (new Date()).getTimezoneOffset() * 60;
-  let startDate = new Date((startUnix + timezoneOffset) * 1000);
-  let endDate = new Date((endUnix+timezoneOffset) * 1000);
+  //const timezoneOffset = (new Date()).getTimezoneOffset() * 60;
+  let startDate = new Date((startUnix) * 1000);
+  let endDate = new Date((endUnix) * 1000);
   let datamap = [];
   let newData = [];
 
@@ -65,7 +65,7 @@ function prepareData(startUnix, endUnix, data) {
     d = data[i];
     // replace date with actual date object & store in datamap
     dateParts = d.Date.split('T')[0].split('-');
-    date = new Date(dateParts[0], dateParts[1]-1, dateParts[2], 0, 0, 0)
+    date = new Date(Date.UTC(dateParts[0], dateParts[1]-1, dateParts[2], 0, 0, 0))
     key = date.getFullYear() + "-" + padZero(date.getMonth() + 1) + "-" + padZero(date.getDate());
     d.Date = date;
     datamap[key] = d;
diff --git a/assets/src/js/components/DatePicker.js b/assets/src/js/components/DatePicker.js
index 8dd4167..f951f89 100644
--- a/assets/src/js/components/DatePicker.js
+++ b/assets/src/js/components/DatePicker.js
@@ -46,7 +46,6 @@ const availablePeriods = {
  },
 }
 
-const timezoneOffset = (new Date()).getTimezoneOffset() * 60;
 const padZero = function(n){return n<10? '0'+n:''+n;}
 
 class DatePicker extends Component {
@@ -55,10 +54,10 @@ class DatePicker extends Component {
 
     this.state = {
       period: props.value,
-      before: 0,
-      after: 0,
-      startDate: null,
-      endDate: null,
+      before: 0, // UTC timestamp
+      after: 0, // UTC timestamp
+      startDate: null, // local date object
+      endDate: null, // local date object
     }
 
     this.updateDatesFromPeriod(this.state.period)
@@ -87,8 +86,8 @@ class DatePicker extends Component {
 
     // create unix timestamps from local date objects
     let before, after;
-    before = Math.round(((+endDate) / 1000) - timezoneOffset);
-    after = Math.round(((+startDate) / 1000) - timezoneOffset);
+    before = Math.round((+endDate) / 1000);
+    after = Math.round((+startDate) / 1000);
 
     this.setState({
       period: period || '',