diff --git a/VDS/Components/Calendar/Calendar.swift b/VDS/Components/Calendar/Calendar.swift
index 3dbf0ba1..cd1c783b 100644
--- a/VDS/Components/Calendar/Calendar.swift
+++ b/VDS/Components/Calendar/Calendar.swift
@@ -160,7 +160,7 @@ open class CalendarBase: Control, Changeable {
         if (minDate <= maxDate) {
             // Check if current date falls between min & max dates.
             let fallsBetween = displayDate.isBetweeen(date: minDate, andDate: maxDate)
-            displayDate = fallsBetween ? displayDate : minDate
+            displayDate = fallsBetween ? displayDate : (displayDate.monthInt == minDate.monthInt) ? minDate : maxDate
             fetchDates(with: displayDate)
         }
         containerView.backgroundColor =  transparentBackground ? .clear : backgroundColorConfiguration.getColor(self)