diff --git a/frontend/packages/yki/src/components/registration/examSession/PublicExamSessionListingFilters.tsx b/frontend/packages/yki/src/components/registration/examSession/PublicExamSessionListingFilters.tsx
index 2b74d0edab..0d19211784 100644
--- a/frontend/packages/yki/src/components/registration/examSession/PublicExamSessionListingFilters.tsx
+++ b/frontend/packages/yki/src/components/registration/examSession/PublicExamSessionListingFilters.tsx
@@ -9,15 +9,13 @@ import {
 } from '@mui/material';
 import { useCallback, useState } from 'react';
 import {
-  AutocompleteValue,
   ComboBox,
   CustomButton,
   LanguageSelect,
-  NativeSelect,
   Text,
 } from 'shared/components';
 import { Color, Severity, TextFieldVariant, Variant } from 'shared/enums';
-import { useDialog, useWindowProperties } from 'shared/hooks';
+import { useDialog } from 'shared/hooks';
 
 import { useCommonTranslation, usePublicTranslation } from 'configs/i18n';
 import { useAppDispatch, useAppSelector } from 'configs/redux';
@@ -48,7 +46,6 @@ const SelectMunicipality = () => {
   const { t } = usePublicTranslation({
     keyPrefix: 'yki.pages.registrationPage',
   });
-  const { isPhone } = useWindowProperties();
 
   return (
     <div className="public-exam-session-filters__filter public-exam-session-filters__municipality">
@@ -59,34 +56,18 @@ const SelectMunicipality = () => {
       >
         {t('labels.selectMunicipality')}
       </Typography>
-      {isPhone ? (
-        <NativeSelect
-          id="public-exam-session-filters__municipality-filter"
-          onChange={(e) => {
-            onMunicipalityChange(e.target.value as string);
-          }}
-          placeholder={t('labels.selectMunicipality')}
-          value={
-            municipality ? municipalityToComboBoxOption(municipality) : null
-          }
-          values={municipalities.map(municipalityToComboBoxOption)}
-        />
-      ) : (
-        <ComboBox
-          id="public-exam-session-filters__municipality-filter"
-          variant={TextFieldVariant.Outlined}
-          values={municipalities.map(municipalityToComboBoxOption)}
-          value={
-            municipality ? municipalityToComboBoxOption(municipality) : null
-          }
-          onChange={(_, v: AutocompleteValue) => {
-            const municipality = v?.value;
-            onMunicipalityChange(municipality);
-          }}
-          label={t('labels.selectMunicipality')}
-          aria-label={t('labels.selectMunicipality')}
-        />
-      )}
+      <ComboBox
+        id="public-exam-session-filters__municipality-filter"
+        variant={TextFieldVariant.Outlined}
+        values={municipalities.map(municipalityToComboBoxOption)}
+        value={municipality ? municipalityToComboBoxOption(municipality) : null}
+        onChange={(v?: string) => {
+          const municipality = v;
+          onMunicipalityChange(municipality);
+        }}
+        label={t('labels.selectMunicipality')}
+        aria-label={t('labels.selectMunicipality')}
+      />
     </div>
   );
 };
@@ -174,7 +155,6 @@ const SelectExamLevel = ({
   const levelValues = Object.values(ExamLevel).map(levelToComboBoxOption);
 
   const errorStyles = { color: 'error.main' };
-  const { isPhone } = useWindowProperties();
 
   return (
     <FormControl
@@ -192,33 +172,20 @@ const SelectExamLevel = ({
           {t('filters.selectExamDetails.required')}
         </span>
       </Typography>
-      {isPhone ? (
-        <NativeSelect
-          id="public-exam-session-filters__level-filter"
-          onChange={(e) => {
-            const level = e.target.value as ExamLevel | undefined;
-            onFilterChange({ level });
-          }}
-          placeholder={t('labels.selectLevel')}
-          value={level ? levelToComboBoxOption(level) : null}
-          values={levelValues}
-        />
-      ) : (
-        <ComboBox
-          id="public-exam-session-filters__level-filter"
-          variant={TextFieldVariant.Outlined}
-          values={levelValues}
-          value={level ? levelToComboBoxOption(level) : null}
-          onChange={(_, v: AutocompleteValue) => {
-            const level = v?.value as ExamLevel | undefined;
-            onFilterChange({ level });
-          }}
-          label={t('labels.selectLevel')}
-          aria-label={t('labels.selectLevel')}
-          showError={showError && !level}
-          helperText={showError && !level ? t('filters.errors.required') : ''}
-        />
-      )}
+      <ComboBox
+        id="public-exam-session-filters__level-filter"
+        variant={TextFieldVariant.Outlined}
+        values={levelValues}
+        value={level ? levelToComboBoxOption(level) : null}
+        onChange={(v?: string) => {
+          const level = v as ExamLevel | undefined;
+          onFilterChange({ level });
+        }}
+        label={t('labels.selectLevel')}
+        aria-label={t('labels.selectLevel')}
+        showError={showError && !level}
+        helperText={showError && !level ? t('filters.errors.required') : ''}
+      />
     </FormControl>
   );
 };
diff --git a/frontend/packages/yki/src/components/registration/steps/register/EmailRegistrationDetails.tsx b/frontend/packages/yki/src/components/registration/steps/register/EmailRegistrationDetails.tsx
index 699f6570e0..e3fa8c7f37 100644
--- a/frontend/packages/yki/src/components/registration/steps/register/EmailRegistrationDetails.tsx
+++ b/frontend/packages/yki/src/components/registration/steps/register/EmailRegistrationDetails.tsx
@@ -5,12 +5,7 @@ import {
   RadioGroup,
 } from '@mui/material';
 import { ChangeEvent, useCallback } from 'react';
-import {
-  AutocompleteValue,
-  LabeledComboBox,
-  LabeledTextField,
-  Text,
-} from 'shared/components';
+import { LabeledComboBox, LabeledTextField, Text } from 'shared/components';
 import {
   InputAutoComplete,
   TextFieldTypes,
@@ -153,10 +148,8 @@ export const EmailRegistrationDetails = () => {
                 ? genderToComboBoxOption(registration.gender)
                 : null
             }
-            onChange={(_, v: AutocompleteValue) => {
-              dispatch(
-                updatePublicRegistration({ gender: v?.value as GenderEnum })
-              );
+            onChange={(v?: string) => {
+              dispatch(updatePublicRegistration({ gender: v as GenderEnum }));
             }}
             showError={showErrors && !!registrationErrors['gender']}
             helperText={
@@ -183,8 +176,8 @@ export const EmailRegistrationDetails = () => {
                   )
                 : null
             }
-            onChange={(_, v: AutocompleteValue) => {
-              dispatch(updatePublicRegistration({ nationality: v?.value }));
+            onChange={(v?: string) => {
+              dispatch(updatePublicRegistration({ nationality: v }));
             }}
             showError={showErrors && !!registrationErrors['nationality']}
             helperText={
diff --git a/frontend/packages/yki/src/components/registration/steps/register/SuomiFiRegistrationDetails.tsx b/frontend/packages/yki/src/components/registration/steps/register/SuomiFiRegistrationDetails.tsx
index ad754a655b..7fffa68a26 100644
--- a/frontend/packages/yki/src/components/registration/steps/register/SuomiFiRegistrationDetails.tsx
+++ b/frontend/packages/yki/src/components/registration/steps/register/SuomiFiRegistrationDetails.tsx
@@ -1,10 +1,5 @@
 import { ChangeEvent } from 'react';
-import {
-  AutocompleteValue,
-  LabeledComboBox,
-  LabeledTextField,
-  Text,
-} from 'shared/components';
+import { LabeledComboBox, LabeledTextField, Text } from 'shared/components';
 import {
   InputAutoComplete,
   TextFieldTypes,
@@ -194,8 +189,8 @@ export const SuomiFiRegistrationDetails = () => {
                 )
               : null
           }
-          onChange={(_, v: AutocompleteValue) => {
-            dispatch(updatePublicRegistration({ nationality: v?.value }));
+          onChange={(v?: string) => {
+            dispatch(updatePublicRegistration({ nationality: v }));
           }}
           showError={showErrors && !!registrationErrors['nationality']}
           helperText={