diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart
index 215e7d77..8628350d 100644
--- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart
+++ b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart
@@ -87,6 +87,8 @@ class MyProfileBloc extends Bloc<MyProfileEvent, MyProfileState> {
               dateFormController: currentState.dateFormController,
               hypoFormController: currentState.hypoFormController,
               hyperFormController: currentState.hyperFormController,
+              selectedCity: currentState.selectedCity,
+              selectedCountry: currentState.selectedCountry,
             ));
           } else {
             var plans = []
@@ -187,6 +189,8 @@ class MyProfileBloc extends Bloc<MyProfileEvent, MyProfileState> {
                   text: data['userDetails']['additional_info']),
               dateFormController:
                   TextEditingController(text: data['userDetails']['birthdate']),
+              selectedCity: data['userDetails']['city'],
+              selectedCountry: data['userDetails']['country'],
             ));
           }
         } else {
diff --git a/lib/presentation/profile/my_profile_screen/my_settings_screen.dart b/lib/presentation/profile/my_profile_screen/my_settings_screen.dart
index 8955ffb1..68e5a00a 100644
--- a/lib/presentation/profile/my_profile_screen/my_settings_screen.dart
+++ b/lib/presentation/profile/my_profile_screen/my_settings_screen.dart
@@ -565,8 +565,8 @@ class _ExpandableListState extends State<ExpandableList> {
         'favorite_foods': state?.favoriteFormController?.text,
         'unfavorite_foods': state?.unfavoriteFormController?.text,
         'additional_info': state?.additionalFormController?.text,
-        'country': state?.selectedCountry,
-        'city': state?.selectedCity,
+        'country': state?.selectedCountry ?? 'Россия',
+        'city': state?.selectedCity ?? 'Москва',
         'has_hypo': state?.hypoFormController,
         'has_hyper': state?.hyperFormController,
       };