diff --git a/assets/src/js/components/DatePicker.js b/assets/src/js/components/DatePicker.js
index 69150bfc..cf3922c7 100644
--- a/assets/src/js/components/DatePicker.js
+++ b/assets/src/js/components/DatePicker.js
@@ -102,8 +102,8 @@ class DatePicker extends Component {
 
     this.state = {
       period: params.p || window.localStorage.getItem('period') || '1w',
-      startDate: new Date(params.s),
-      endDate: new Date(params.e),
+      startDate: new Date(params.s || 'now'),
+      endDate: new Date(params.e || 'now'),
       groupBy: params.g || 'day',
     }    
     this.state.diff = this.calculateDiff(this.state.startDate, this.state.endDate)