diff --git a/src/components/layout/PreferencesRow.vue b/src/components/layout/PreferencesRow.vue
index 717339b..0acfca3 100644
--- a/src/components/layout/PreferencesRow.vue
+++ b/src/components/layout/PreferencesRow.vue
@@ -52,7 +52,7 @@ function notImplemented() {
       <DropdownMenuContent align="center" class="w-40">
         <DropdownMenuLabel>{{ t('common.nav.theme') }}</DropdownMenuLabel>
         <DropdownMenuSeparator />
-        <DropdownMenuRadioGroup :model-value="theme" @update:model-value="(v: string) => setTheme(v as 'dark' | 'light' | 'system')">
+        <DropdownMenuRadioGroup :model-value="theme" @update:model-value="(v) => v != null && setTheme(v as 'dark' | 'light' | 'system')">
           <DropdownMenuRadioItem value="light"><Sun class="w-4 h-4 mr-2" />{{ t('common.nav.themeLight') }}</DropdownMenuRadioItem>
           <DropdownMenuRadioItem value="dark"><Moon class="w-4 h-4 mr-2" />{{ t('common.nav.themeDark') }}</DropdownMenuRadioItem>
           <DropdownMenuRadioItem value="system"><Monitor class="w-4 h-4 mr-2" />{{ t('common.nav.themeSystem') }}</DropdownMenuRadioItem>
@@ -71,7 +71,7 @@ function notImplemented() {
       <DropdownMenuContent align="center" class="w-44">
         <DropdownMenuLabel>{{ t('common.nav.language') }}</DropdownMenuLabel>
         <DropdownMenuSeparator />
-        <DropdownMenuRadioGroup :model-value="currentLocale" @update:model-value="(v: string) => setLocale(v)">
+        <DropdownMenuRadioGroup :model-value="currentLocale" @update:model-value="(v) => v != null && setLocale(v as string)">
           <DropdownMenuRadioItem v-for="l in locales" :key="l.code" :value="l.code">
             <span class="mr-2">{{ l.flag }}</span>{{ l.name }}
           </DropdownMenuRadioItem>
@@ -106,7 +106,7 @@ function notImplemented() {
         </button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" class="w-40">
-        <DropdownMenuRadioGroup :model-value="theme" @update:model-value="(v: string) => setTheme(v as 'dark' | 'light' | 'system')">
+        <DropdownMenuRadioGroup :model-value="theme" @update:model-value="(v) => v != null && setTheme(v as 'dark' | 'light' | 'system')">
           <DropdownMenuRadioItem value="light"><Sun class="w-4 h-4 mr-2" />{{ t('common.nav.themeLight') }}</DropdownMenuRadioItem>
           <DropdownMenuRadioItem value="dark"><Moon class="w-4 h-4 mr-2" />{{ t('common.nav.themeDark') }}</DropdownMenuRadioItem>
           <DropdownMenuRadioItem value="system"><Monitor class="w-4 h-4 mr-2" />{{ t('common.nav.themeSystem') }}</DropdownMenuRadioItem>
@@ -129,7 +129,7 @@ function notImplemented() {
         </button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" class="w-44">
-        <DropdownMenuRadioGroup :model-value="currentLocale" @update:model-value="(v: string) => setLocale(v)">
+        <DropdownMenuRadioGroup :model-value="currentLocale" @update:model-value="(v) => v != null && setLocale(v as string)">
           <DropdownMenuRadioItem v-for="l in locales" :key="l.code" :value="l.code">
             <span class="mr-2">{{ l.flag }}</span>{{ l.name }}
           </DropdownMenuRadioItem>