diff --git a/apps/mobile/packages/core_localization/lib/src/data/repositories_impl/locale_repository_impl.dart b/apps/mobile/packages/core_localization/lib/src/data/repositories_impl/locale_repository_impl.dart
index 086cb954..861f579f 100644
--- a/apps/mobile/packages/core_localization/lib/src/data/repositories_impl/locale_repository_impl.dart
+++ b/apps/mobile/packages/core_localization/lib/src/data/repositories_impl/locale_repository_impl.dart
@@ -21,6 +21,13 @@ class LocaleRepositoryImpl implements LocaleRepositoryInterface {
 
   @override
   Future<Locale> getSavedLocale() async {
+    final String? savedLanguageCode = await localDataSource.getLanguageCode();
+    if (savedLanguageCode != null) {
+      final Locale savedLocale = Locale(savedLanguageCode);
+      if (getSupportedLocales().contains(savedLocale)) {
+        return savedLocale;
+      }
+    }
     return getDefaultLocale();
   }
 
diff --git a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/pages/language_selection_page.dart b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/pages/language_selection_page.dart
index ef4213d7..3a3e9deb 100644
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/pages/language_selection_page.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/pages/language_selection_page.dart
@@ -40,10 +40,6 @@ class LanguageSelectionPage extends StatelessWidget {
       appBar: UiAppBar(
         title: t.settings.change_language,
         showBackButton: true,
-        bottom: PreferredSize(
-          preferredSize: const Size.fromHeight(1.0),
-          child: Container(color: UiColors.border, height: 1.0),
-        ),
       ),
       body: SafeArea(
         child: BlocBuilder<LocaleBloc, LocaleState>(
diff --git a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/widgets/personal_info_page/language_selector.dart b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/widgets/personal_info_page/language_selector.dart
index 30bdff3d..34c1ccd4 100644
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/widgets/personal_info_page/language_selector.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/widgets/personal_info_page/language_selector.dart
@@ -20,7 +20,7 @@ class LanguageSelector extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       spacing: UiConstants.space3,
-      children: [
+      children: <Widget>[
         const FieldLabel(text: 'Language'),
 
         GestureDetector(