diff --git a/src/components/common/TimePicker.jsx b/src/components/common/TimePicker.jsx
index 56a0e426..cb76a5d1 100644
--- a/src/components/common/TimePicker.jsx
+++ b/src/components/common/TimePicker.jsx
@@ -76,8 +76,9 @@ const TimePicker = ({ label, onChange, interval = 10, value,checkInTime,checkOut
       }
     } else if (checkInDate && checkOutDate) {
       // Case 3: Both check-in and checkout present
+      const isSameDay = new Date(checkOutDate).toDateString() === new Date().toDateString();
       minSelectable = new Date(checkOutDate);
-      maxSelectable = new Date(currentSlot);
+      maxSelectable = isSameDay ? new Date(dayEnd) : new Date(currentSlot);
     }
   
     const slot = new Date(dayStart.getTime());