diff --git a/src/date-utils.es6 b/src/date-utils.es6
index caa37200e..5905d6ae3 100644
--- a/src/date-utils.es6
+++ b/src/date-utils.es6
@@ -49,7 +49,8 @@ chronoFuture.refiners.push(EnforceFutureDate);
 
 const Hours = {
   Morning: 9,
-  Evening: 19,
+  Evening: 20,
+  Midnight: 24,
 }
 
 const Days = {
@@ -69,6 +70,10 @@ function evening(momentDate, eveningHour = Hours.Evening) {
   return oclock(momentDate.hour(eveningHour))
 }
 
+function midnight(momentDate, midnightHour = Hours.Midnight) {
+  return oclock(momentDate.hour(midnightHour))
+}
+
 
 const DateUtils = {
 
@@ -100,7 +105,7 @@ const DateUtils = {
 
   tonight(now = moment()) {
     if (now.hour() >= Hours.Evening) {
-      return DateUtils.tomorrowEvening();
+      return midnight(now);
     }
     return evening(now)
   },