diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py
index 9dac17cae0d..13a06586632 100644
--- a/homeassistant/components/frontend/version.py
+++ b/homeassistant/components/frontend/version.py
@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "a6643dc82e02ec14b6c1b662f1aab661"
+VERSION = "8bb96a595e6f289fcfff343778765b42"
diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html
index 0f8fc706158..abe4a7215f6 100644
--- a/homeassistant/components/frontend/www_static/frontend.html
+++ b/homeassistant/components/frontend/www_static/frontend.html
@@ -23253,6 +23253,19 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         dataTable.addRow([entityDisplay, stateStr, start, end]);
       };
 
+      var startTime = new Date(stateHistory.map(function(stateInfo) {
+        return stateInfo[0].lastChangedAsDate;
+      }).reduce(function(prev, cur) {
+        return Math.min(prev, cur);
+      }, new Date()));
+
+      // end time is Math.min(curTime, start time + 1 day)
+      var endTime = new Date(startTime);
+      endTime.setDate(endTime.getDate()+1);
+      if (endTime > new Date()) {
+        endTime = new Date();
+      }
+
       var numTimelines = 0;
       // stateHistory is a list of lists of sorted state objects
       stateHistory.forEach(function(stateInfo) {
@@ -23275,10 +23288,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
           }
         });
 
-        // end time is start time + 1 day
-        var endTime = new Date(stateInfo[0].lastChangedAsDate);
-        endTime.setDate(endTime.getDate()+1);
-
         addRow(entityDisplay, prevState, prevLastChanged, endTime);
         numTimelines++;
       }.bind(this));
diff --git a/homeassistant/components/frontend/www_static/polymer/components/state-history-chart-timeline.html b/homeassistant/components/frontend/www_static/polymer/components/state-history-chart-timeline.html
index 2db7a9a5896..db9d935d127 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/state-history-chart-timeline.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/state-history-chart-timeline.html
@@ -64,6 +64,19 @@
         dataTable.addRow([entityDisplay, stateStr, start, end]);
       };
 
+      var startTime = new Date(stateHistory.map(function(stateInfo) {
+        return stateInfo[0].lastChangedAsDate;
+      }).reduce(function(prev, cur) {
+        return Math.min(prev, cur);
+      }, new Date()));
+
+      // end time is Math.min(curTime, start time + 1 day)
+      var endTime = new Date(startTime);
+      endTime.setDate(endTime.getDate()+1);
+      if (endTime > new Date()) {
+        endTime = new Date();
+      }
+
       var numTimelines = 0;
       // stateHistory is a list of lists of sorted state objects
       stateHistory.forEach(function(stateInfo) {
@@ -86,10 +99,6 @@
           }
         });
 
-        // end time is start time + 1 day
-        var endTime = new Date(stateInfo[0].lastChangedAsDate);
-        endTime.setDate(endTime.getDate()+1);
-
         addRow(entityDisplay, prevState, prevLastChanged, endTime);
         numTimelines++;
       }.bind(this));