diff --git a/homeassistant/components/history.py b/homeassistant/components/history.py
index 991e8a7bbb4..d8ff307fdde 100644
--- a/homeassistant/components/history.py
+++ b/homeassistant/components/history.py
@@ -230,7 +230,6 @@ class HistoryPeriodView(HomeAssistantView):
         now = dt_util.utcnow()
 
         one_day = timedelta(days=1)
-
         if datetime:
             start_time = dt_util.as_utc(datetime)
         else:
@@ -239,7 +238,14 @@ class HistoryPeriodView(HomeAssistantView):
         if start_time > now:
             return self.json([])
 
-        end_time = start_time + one_day
+        end_time = request.GET.get('end_time')
+        if end_time:
+            end_time = dt_util.as_utc(
+                dt_util.parse_datetime(end_time))
+            if end_time is None:
+                return self.json_message('Invalid end_time', HTTP_BAD_REQUEST)
+        else:
+            end_time = start_time + one_day
         entity_id = request.GET.get('filter_entity_id')
 
         result = yield from request.app['hass'].loop.run_in_executor(