diff --git a/view/frontend/web/js/view/address-autocomplete.js b/view/frontend/web/js/view/address-autocomplete.js
index cea816bf..98636602 100755
--- a/view/frontend/web/js/view/address-autocomplete.js
+++ b/view/frontend/web/js/view/address-autocomplete.js
@@ -133,7 +133,7 @@ define([
                                 delay: 400,
                                 url: function (params) {
                                     const queryParams = new URLSearchParams({
-                                        country: $(self.countrySelector).val(),
+                                        country: $(self.countrySelector).val()?.toUpperCase(),
                                         limit: searchLimit,
                                         offset: ((params.page || 1) - 1) * searchLimit,
                                         q: unescape(params.term)
diff --git a/view/frontend/web/js/view/payment/method-renderer/two_payment.js b/view/frontend/web/js/view/payment/method-renderer/two_payment.js
index 68a8568a..027ba88d 100755
--- a/view/frontend/web/js/view/payment/method-renderer/two_payment.js
+++ b/view/frontend/web/js/view/payment/method-renderer/two_payment.js
@@ -447,7 +447,7 @@ define([
                                 delay: 400,
                                 url: function (params) {
                                     const queryParams = new URLSearchParams({
-                                        country: self.countryCode(),
+                                        country: self.countryCode()?.toUpperCase(),
                                         limit: searchLimit,
                                         offset: ((params.page || 1) - 1) * searchLimit,
                                         q: unescape(params.term)