diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py
index cd26abaabc8..b50faa855fc 100644
--- a/addons/resource/models/resource.py
+++ b/addons/resource/models/resource.py
@@ -420,8 +420,12 @@ class ResourceCalendar(models.Model):
                                dtstart=start_dt,
                                until=end_dt,
                                byweekday=self._get_weekdays()):
-            start_time = day.date() == start_dt.date() and start_dt.time() or datetime.time.min
-            end_time = day.date() == end_dt.date() and end_dt.time() or datetime.time.max
+            start_time = datetime.time.min
+            if day.date() == start_dt.date():
+                start_time = start_dt.time()
+            end_time = datetime.time.max
+            if day.date() == end_dt.date() and end_dt.time() != datetime.time():
+                end_time = end_dt.time()
 
             intervals = self._get_day_work_intervals(
                 day.date(),
@@ -445,8 +449,12 @@ class ResourceCalendar(models.Model):
                                dtstart=start_dt,
                                until=end_dt,
                                byweekday=self._get_weekdays()):
-            start_time = day.date() == start_dt.date() and start_dt.time() or datetime.time.min
-            end_time = day.date() == end_dt.date() and end_dt.time() or datetime.time.max
+            start_time = datetime.time.min
+            if day.date() == start_dt.date():
+                start_time = start_dt.time()
+            end_time = datetime.time.max
+            if day.date() == end_dt.date() and end_dt.time() != datetime.time():
+                end_time = end_dt.time()
 
             intervals = self._get_day_leave_intervals(
                 day.date(),