diff --git a/src/components/AddressSearch/index.js b/src/components/AddressSearch/index.js
index 9699eb9aab94..795e45c6f892 100644
--- a/src/components/AddressSearch/index.js
+++ b/src/components/AddressSearch/index.js
@@ -120,7 +120,7 @@ function AddressSearch(props) {
             postal_code: zipCode,
             administrative_area_level_1: state,
             administrative_area_level_2: stateFallback,
-            country,
+            country: countryPrimary,
         } = GooglePlacesUtils.getAddressComponents(addressComponents, {
             street_number: 'long_name',
             route: 'long_name',
@@ -142,7 +142,15 @@ function AddressSearch(props) {
 
         // Make sure that the order of keys remains such that the country is always set above the state.
         // Refer to https://github.com/Expensify/App/issues/15633 for more information.
-        const {state: stateAutoCompleteFallback = '', city: cityAutocompleteFallback = ''} = GooglePlacesUtils.getPlaceAutocompleteTerms(autocompleteData.terms);
+        const {
+            country: countryFallbackLongName = '',
+            state: stateAutoCompleteFallback = '',
+            city: cityAutocompleteFallback = '',
+        } = GooglePlacesUtils.getPlaceAutocompleteTerms(autocompleteData.terms);
+
+        const countryFallback = _.findKey(CONST.ALL_COUNTRIES, (country) => country === countryFallbackLongName);
+
+        const country = countryPrimary || countryFallback;
 
         const values = {
             street: `${streetNumber} ${streetName}`.trim(),
diff --git a/tests/unit/GooglePlacesUtilsTest.js b/tests/unit/GooglePlacesUtilsTest.js
index ef7a4491fec0..1bb27bdd9f2f 100644
--- a/tests/unit/GooglePlacesUtilsTest.js
+++ b/tests/unit/GooglePlacesUtilsTest.js
@@ -129,6 +129,12 @@ const addressComponents = [
         types: ['postal_code'],
     },
 ];
+
+const autoCompleteTerms = [
+    {offset: 0, value: 'Bangladesh Border Road'},
+    {offset: 24, value: 'Bangladesh'},
+];
+
 describe('GooglePlacesUtilsTest', () => {
     describe('getAddressComponents', () => {
         it('should find address components by type', () => {
@@ -189,4 +195,14 @@ describe('GooglePlacesUtilsTest', () => {
             expect(executionTime).toBeLessThan(5.0);
         });
     });
+    describe('getPlaceAutocompleteTerms', () => {
+        it('should find auto complete terms', () => {
+            expect(GooglePlacesUtils.getPlaceAutocompleteTerms(autoCompleteTerms)).toStrictEqual({
+                country: 'Bangladesh',
+                state: 'Bangladesh Border Road',
+                city: '',
+                street: '',
+            });
+        });
+    });
 });