diff --git a/src/view/phui/calendar/PHUICalendarDayView.php b/src/view/phui/calendar/PHUICalendarDayView.php
index 1975d6610a..844cd31222 100644
--- a/src/view/phui/calendar/PHUICalendarDayView.php
+++ b/src/view/phui/calendar/PHUICalendarDayView.php
@@ -1,481 +1,478 @@
 <?php
 
 final class PHUICalendarDayView extends AphrontView {
   private $rangeStart;
   private $rangeEnd;
 
   private $day;
   private $month;
   private $year;
   private $browseURI;
   private $query;
   private $events = array();
 
   private $allDayEvents = array();
 
   public function addEvent(AphrontCalendarEventView $event) {
     $this->events[] = $event;
     return $this;
   }
 
   public function setBrowseURI($browse_uri) {
     $this->browseURI = $browse_uri;
     return $this;
   }
   private function getBrowseURI() {
     return $this->browseURI;
   }
 
   public function setQuery($query) {
     $this->query = $query;
     return $this;
   }
   private function getQuery() {
     return $this->query;
   }
 
   public function __construct(
     $range_start,
     $range_end,
     $year,
     $month,
     $day = null) {
 
     $this->rangeStart = $range_start;
     $this->rangeEnd = $range_end;
 
     $this->day = $day;
     $this->month = $month;
     $this->year = $year;
   }
 
   public function render() {
     require_celerity_resource('phui-calendar-day-css');
 
     $viewer = $this->getUser();
 
     $hours = $this->getHoursOfDay();
     $js_hours = array();
     $js_today_events = array();
 
     foreach ($hours as $hour) {
       $js_hours[] = array(
         'hour' => $hour->format('G'),
         'hour_meridian' => $hour->format('g A'),
       );
     }
 
     $first_event_hour = null;
     $js_today_all_day_events = array();
     $all_day_events = $this->getAllDayEvents();
 
     $day_start = $this->getDateTime();
     $day_end = id(clone $day_start)->modify('+1 day');
 
     $day_start_epoch = $day_start->format('U');
     $day_end_epoch = $day_end->format('U') - 1;
 
     foreach ($all_day_events as $all_day_event) {
       $all_day_start = $all_day_event->getEpochStart();
       $all_day_end = $all_day_event->getEpochEnd();
 
       if ($all_day_start < $day_end_epoch && $all_day_end > $day_start_epoch) {
         $js_today_all_day_events[] = array(
           'name' => $all_day_event->getName(),
           'id' => $all_day_event->getEventID(),
           'viewerIsInvited' => $all_day_event->getViewerIsInvited(),
           'uri' => $all_day_event->getURI(),
         );
       }
     }
 
     $this->events = msort($this->events, 'getEpochStart');
     $first_event_hour = $this->getDateTime()->setTime(8, 0, 0);
+    $midnight = $this->getDateTime()->setTime(0, 0, 0);
 
     foreach ($this->events as $event) {
       if ($event->getIsAllDay()) {
         continue;
       }
       if ($event->getEpochStart() <= $day_end_epoch &&
         $event->getEpochEnd() > $day_start_epoch) {
 
-        if ($first_event_hour === null) {
+        if ($event->getEpochStart() < $midnight->format('U') &&
+          $event->getEpochEnd() > $midnight->format('U')) {
+          $first_event_hour = clone $midnight;
+        }
+
+        if ($event->getEpochStart() < $first_event_hour->format('U') &&
+          $event->getEpochStart() > $midnight->format('U')) {
           $first_event_hour = PhabricatorTime::getDateTimeFromEpoch(
             $event->getEpochStart(),
             $viewer);
-
-          $midnight = $this->getDateTime()->setTime(0, 0, 0);
-
-          if ($first_event_hour->format('U') < $midnight->format('U')) {
-            $first_event_hour = clone $midnight;
-          }
-
-          $eight_am = $this->getDateTime()->setTime(8, 0, 0);
-          if ($eight_am->format('U') < $first_event_hour->format('U')) {
-            $first_event_hour = clone $eight_am;
-          }
+          $first_event_hour->setTime($first_event_hour->format('h'), 0, 0);
         }
 
         $event_start = max($event->getEpochStart(), $day_start_epoch);
         $event_end = min($event->getEpochEnd(), $day_end_epoch);
 
         $day_duration = ($day_end_epoch - $first_event_hour->format('U')) / 60;
 
         $top = (($event_start - $first_event_hour->format('U'))
           / ($day_end_epoch - $first_event_hour->format('U')))
           * $day_duration;
         $top = max(0, $top);
 
         $height = (($event_end - $event_start)
           / ($day_end_epoch - $first_event_hour->format('U')))
           * $day_duration;
         $height = min($day_duration, $height);
 
         $js_today_events[] = array(
           'eventStartEpoch' => $event->getEpochStart(),
           'eventEndEpoch' => $event->getEpochEnd(),
           'eventName' => $event->getName(),
           'eventID' => $event->getEventID(),
           'viewerIsInvited' => $event->getViewerIsInvited(),
           'uri' => $event->getURI(),
           'offset' => '0',
           'width' => '100%',
           'top' => $top.'px',
           'height' => $height.'px',
           'canEdit' => $event->getCanEdit(),
         );
       }
     }
 
     $header = $this->renderDayViewHeader();
     $sidebar = $this->renderSidebar();
     $warnings = $this->getQueryRangeWarning();
 
     $table_id = celerity_generate_unique_node_id();
 
     $table_wrapper = phutil_tag(
       'div',
       array(
         'id' => $table_id,
       ),
       '');
 
     Javelin::initBehavior(
       'day-view',
       array(
         'year' => $first_event_hour->format('Y'),
         'month' => $first_event_hour->format('m'),
         'day' => $first_event_hour->format('d'),
         'query' => $this->getQuery(),
         'allDayEvents' => $js_today_all_day_events,
         'todayEvents' => $js_today_events,
         'hours' => $js_hours,
         'firstEventHour' => $first_event_hour->format('G'),
         'firstEventHourEpoch' => $first_event_hour->format('U'),
         'tableID' => $table_id,
       ));
 
     $table_box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->appendChild($table_wrapper)
       ->setFormErrors($warnings)
       ->setFlush(true);
 
     $layout = id(new AphrontMultiColumnView())
       ->addColumn($sidebar, 'third')
       ->addColumn($table_box, 'thirds phui-day-view-column')
       ->setFluidLayout(true)
       ->setGutter(AphrontMultiColumnView::GUTTER_MEDIUM);
 
     return phutil_tag(
       'div',
         array(
           'class' => 'ml',
         ),
         $layout);
   }
 
   private function getAllDayEvents() {
     $all_day_events = array();
 
     foreach ($this->events as $event) {
       if ($event->getIsAllDay()) {
         $all_day_events[] = $event;
       }
     }
 
     $all_day_events = array_values(msort($all_day_events, 'getEpochStart'));
     return $all_day_events;
   }
 
   private function getQueryRangeWarning() {
     $errors = array();
 
     $range_start_epoch = $this->rangeStart->getEpoch();
     $range_end_epoch = $this->rangeEnd->getEpoch();
 
     $day_start = $this->getDateTime();
     $day_end = id(clone $day_start)->modify('+1 day');
 
     $day_start = $day_start->format('U');
     $day_end = $day_end->format('U') - 1;
 
     if (($range_start_epoch != null &&
         $range_start_epoch < $day_end &&
         $range_start_epoch > $day_start) ||
       ($range_end_epoch != null &&
         $range_end_epoch < $day_end &&
         $range_end_epoch > $day_start)) {
       $errors[] = pht('Part of the day is out of range');
     }
 
     if (($this->rangeEnd->getEpoch() != null &&
         $this->rangeEnd->getEpoch() < $day_start) ||
       ($this->rangeStart->getEpoch() != null &&
         $this->rangeStart->getEpoch() > $day_end)) {
       $errors[] = pht('Day is out of query range');
     }
     return $errors;
   }
 
   private function renderSidebar() {
     $this->events = msort($this->events, 'getEpochStart');
     $week_of_boxes = $this->getWeekOfBoxes();
     $filled_boxes = array();
 
     foreach ($week_of_boxes as $day_box) {
       $box_start = $day_box['start'];
       $box_end = id(clone $box_start)->modify('+1 day');
 
       $box_start = $box_start->format('U');
       $box_end = $box_end->format('U');
 
       $box_events = array();
 
       foreach ($this->events as $event) {
         $event_start = $event->getEpochStart();
         $event_end = $event->getEpochEnd();
 
         if ($event_start < $box_end && $event_end > $box_start) {
           $box_events[] = $event;
         }
       }
 
       $filled_boxes[] = $this->renderSidebarBox(
         $box_events,
         $day_box['title']);
     }
 
     return $filled_boxes;
   }
 
   private function renderSidebarBox($events, $title) {
     $widget = id(new PHUICalendarWidgetView())
       ->addClass('calendar-day-view-sidebar');
 
     $list = id(new PHUICalendarListView())
       ->setUser($this->user)
       ->setView('day');
 
     if (count($events) == 0) {
       $list->showBlankState(true);
     } else {
       $sorted_events = msort($events, 'getEpochStart');
       foreach ($sorted_events as $event) {
         $list->addEvent($event);
       }
     }
 
     $widget
       ->setCalendarList($list)
       ->setHeader($title);
     return $widget;
   }
 
   private function getWeekOfBoxes() {
     $sidebar_day_boxes = array();
 
     $display_start_day = $this->getDateTime();
     $display_end_day = id(clone $display_start_day)->modify('+6 day');
 
     $box_start_time = clone $display_start_day;
 
     $today_time = PhabricatorTime::getTodayMidnightDateTime($this->user);
     $tomorrow_time = clone $today_time;
     $tomorrow_time->modify('+1 day');
 
     while ($box_start_time <= $display_end_day) {
       if ($box_start_time == $today_time) {
         $title = pht('Today');
       } else if ($box_start_time == $tomorrow_time) {
         $title = pht('Tomorrow');
       } else {
         $title = $box_start_time->format('l');
       }
 
       $sidebar_day_boxes[] = array(
         'title' => $title,
         'start' => clone $box_start_time,
         );
 
       $box_start_time->modify('+1 day');
     }
     return $sidebar_day_boxes;
   }
 
   private function renderDayViewHeader() {
     $button_bar = null;
     $uri = $this->getBrowseURI();
     if ($uri) {
       list($prev_year, $prev_month, $prev_day) = $this->getPrevDay();
       $prev_uri = $uri.$prev_year.'/'.$prev_month.'/'.$prev_day.'/';
 
       list($next_year, $next_month, $next_day) = $this->getNextDay();
       $next_uri = $uri.$next_year.'/'.$next_month.'/'.$next_day.'/';
 
       $button_bar = new PHUIButtonBarView();
 
       $left_icon = id(new PHUIIconView())
           ->setIconFont('fa-chevron-left bluegrey');
       $left = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
         ->setHref($prev_uri)
         ->setTitle(pht('Previous Day'))
         ->setIcon($left_icon);
 
       $right_icon = id(new PHUIIconView())
           ->setIconFont('fa-chevron-right bluegrey');
       $right = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
         ->setHref($next_uri)
         ->setTitle(pht('Next Day'))
         ->setIcon($right_icon);
 
       $button_bar->addButton($left);
       $button_bar->addButton($right);
 
     }
 
     $display_day = $this->getDateTime();
     $header_text = $display_day->format('l, F j, Y');
 
     $header = id(new PHUIHeaderView())
       ->setHeader($header_text);
 
     if ($button_bar) {
       $header->setButtonBar($button_bar);
     }
 
     return $header;
   }
 
   private function updateEventsFromCluster($cluster, $hourly_events) {
     $cluster_size = count($cluster);
     $n = 0;
     foreach ($cluster as $cluster_member) {
       $event_id = $cluster_member->getEventID();
       $offset = (($n / $cluster_size) * 100).'%';
       $width = ((1 / $cluster_size) * 100).'%';
 
       if (isset($hourly_events[$event_id])) {
         $hourly_events[$event_id]['offset'] = $offset;
         $hourly_events[$event_id]['width'] = $width;
       }
       $n++;
     }
 
     return $hourly_events;
   }
 
   // returns DateTime of each hour in the day
   private function getHoursOfDay() {
     $included_datetimes = array();
 
     $day_datetime = $this->getDateTime();
     $day_epoch = $day_datetime->format('U');
 
     $day_datetime->modify('+1 day');
     $next_day_epoch = $day_datetime->format('U');
 
     $included_time = $day_epoch;
     $included_datetime = $this->getDateTime();
 
     while ($included_time < $next_day_epoch) {
       $included_datetimes[] = clone $included_datetime;
 
       $included_datetime->modify('+1 hour');
       $included_time = $included_datetime->format('U');
     }
 
     return $included_datetimes;
   }
 
   private function getPrevDay() {
     $prev = $this->getDateTime();
     $prev->modify('-1 day');
     return array(
       $prev->format('Y'),
       $prev->format('m'),
       $prev->format('d'),
     );
   }
 
   private function getNextDay() {
     $next = $this->getDateTime();
     $next->modify('+1 day');
     return array(
       $next->format('Y'),
       $next->format('m'),
       $next->format('d'),
     );
   }
 
   private function getDateTime() {
     $user = $this->user;
     $timezone = new DateTimeZone($user->getTimezoneIdentifier());
 
     $day = $this->day;
     $month = $this->month;
     $year = $this->year;
 
     $date = new DateTime("{$year}-{$month}-{$day} ", $timezone);
 
     return $date;
   }
 
   private function findTodayClusters() {
     $events = msort($this->todayEvents, 'getEpochStart');
     $clusters = array();
 
     foreach ($events as $event) {
       $destination_cluster_key = null;
       $event_start = $event->getEpochStart() - (30 * 60);
       $event_end = $event->getEpochEnd() + (30 * 60);
 
       foreach ($clusters as $key => $cluster) {
         foreach ($cluster as $clustered_event) {
           $compare_event_start = $clustered_event->getEpochStart();
           $compare_event_end = $clustered_event->getEpochEnd();
 
           if ($event_start < $compare_event_end
             && $event_end > $compare_event_start) {
             $destination_cluster_key = $key;
             break;
           }
         }
       }
 
       if ($destination_cluster_key !== null) {
         $clusters[$destination_cluster_key][] = $event;
       } else {
         $next_cluster = array();
         $next_cluster[] = $event;
         $clusters[] = $next_cluster;
       }
     }
 
     return $clusters;
   }
 }