diff --git a/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar-day.svelte b/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar-day.svelte
index 061a5036f..e4d73d8f3 100644
--- a/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar-day.svelte
+++ b/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar-day.svelte
@@ -15,9 +15,11 @@
 	export { className as class };
 
 	export let maxValue = undefined;
+	export let minValue = undefined;
 
 	$: hideExtraDay =
-		date.year >= maxValue.year && date.month >= maxValue.month && date.day >= maxValue.day
+		(date.year >= maxValue.year && date.month >= maxValue.month && date.day >= maxValue.day) ||
+		(date.year <= minValue.year && date.month <= minValue.month && date.day < minValue.day)
 			? true
 			: false;
 </script>
diff --git a/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar.svelte b/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar.svelte
index 92c098088..0062d35dd 100644
--- a/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar.svelte
+++ b/packages/ui/core-components/src/lib/atoms/shadcn/range-calendar/range-calendar.svelte
@@ -155,7 +155,7 @@
 						<RangeCalendar.GridRow class="w-full mt-2">
 							{#each weekDates as date}
 								<RangeCalendar.Cell {date}>
-									<RangeCalendar.Day {date} month={month.value} {maxValue} />
+									<RangeCalendar.Day {date} month={month.value} {maxValue} {minValue} />
 								</RangeCalendar.Cell>
 							{/each}
 						</RangeCalendar.GridRow>