diff --git a/homeassistant/components/history.py b/homeassistant/components/history.py index 9863e823e06..5904a99e43c 100644 --- a/homeassistant/components/history.py +++ b/homeassistant/components/history.py @@ -283,9 +283,10 @@ class HistoryPeriodView(HomeAssistantView): end_time = request.query.get('end_time') if end_time: - end_time = dt_util.as_utc( - dt_util.parse_datetime(end_time)) - if end_time is None: + end_time = dt_util.parse_datetime(end_time) + if end_time: + end_time = dt_util.as_utc(end_time) + else: return self.json_message('Invalid end_time', HTTP_BAD_REQUEST) else: end_time = start_time + one_day