diff --git a/lib/cake_pay/cake_pay_api.dart b/lib/cake_pay/cake_pay_api.dart
index 1f91b338d..a39fbe085 100644
--- a/lib/cake_pay/cake_pay_api.dart
+++ b/lib/cake_pay/cake_pay_api.dart
@@ -233,7 +233,8 @@ class CakePayApi {
     var response = await http.get(uri, headers: headers);
 
     if (response.statusCode != 200) {
-      throw Exception(response.body);
+      throw Exception(
+          'Failed to fetch vendors: statusCode - ${response.statusCode}, queryParams -$queryParams, response - ${response.body}');
     }
 
     final bodyJson = json.decode(response.body);
diff --git a/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart b/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
index 31eaa23ff..f2958ee31 100644
--- a/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
+++ b/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
@@ -94,6 +94,10 @@ class CakePayCardsPage extends BasePage {
             _cardsListViewModel.resetLoadingNextPageState();
             _cardsListViewModel.getVendors();
           }
+
+          _cardsListViewModel.settingsStore.selectedCakePayCountry =
+              _cardsListViewModel.selectedCountry;
+
         }
       });
     });