diff --git a/src/services/useDateRegistry/index.ts b/src/services/useDateRegistry/index.ts
index 17b4e807f..0bdec3ee2 100644
--- a/src/services/useDateRegistry/index.ts
+++ b/src/services/useDateRegistry/index.ts
@@ -54,7 +54,7 @@ export function createDateRegistry() {
  * @param dates The reactive ref containing `Date[]` to be registered.
  */
 export function useDateRegistry(dates: DateRefOrGetter) {
-  const registry = inject(DATE_REGISTRY_KEY)
+  const registry = inject(DATE_REGISTRY_KEY, undefined)
   if (!registry) return
 
   onMounted(() => {
diff --git a/src/services/useSelectedDate/index.ts b/src/services/useSelectedDate/index.ts
index 5eac0a565..aca6a3881 100644
--- a/src/services/useSelectedDate/index.ts
+++ b/src/services/useSelectedDate/index.ts
@@ -25,11 +25,9 @@ export function provideSelectedDate(date: DateRefOrGetter) {
  * @returns The selected date.
  */
 export function useSelectedDate(fallbackDate: DateRefOrGetter) {
-  const injectedDate = inject(SELECTED_DATE_KEY)
+  const injectedDate = inject(SELECTED_DATE_KEY, fallbackDate)
 
-  const selectedDate = injectedDate
-    ? computed(() => toValue(injectedDate))
-    : computed(() => toValue(fallbackDate))
+  const selectedDate = computed(() => toValue(injectedDate))
 
   return {
     selectedDate,