diff --git a/src/components/AddressSearch/index.tsx b/src/components/AddressSearch/index.tsx
index 1df709b51dfa..f0e9db4d35e1 100644
--- a/src/components/AddressSearch/index.tsx
+++ b/src/components/AddressSearch/index.tsx
@@ -162,13 +162,7 @@ function AddressSearch(
 
         // 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 {
-            country: countryFallbackLongName = '',
-            state: stateAutoCompleteFallback = '',
-            city: cityAutocompleteFallback = '',
-            street: streetAutocompleteFallback = '',
-            streetNumber: streetNumberAutocompleteFallback = '',
-        } = getPlaceAutocompleteTerms(autocompleteData?.terms ?? []);
+        const {country: countryFallbackLongName = '', state: stateAutoCompleteFallback = '', city: cityAutocompleteFallback = ''} = getPlaceAutocompleteTerms(autocompleteData?.terms ?? []);
 
         const countryFallback = Object.keys(CONST.ALL_COUNTRIES).find((country) => country === countryFallbackLongName);
 
@@ -176,7 +170,7 @@ function AddressSearch(
         const country = countryPrimary || countryFallback || '';
 
         const values = {
-            street: `${streetNumber || streetNumberAutocompleteFallback} ${streetName || streetAutocompleteFallback}`.trim(),
+            street: `${streetNumber} ${streetName}`.trim(),
             name: details.name ?? '',
             // Autocomplete returns any additional valid address fragments (e.g. Apt #) as subpremise.
             street2: subpremise,
diff --git a/src/libs/GooglePlacesUtils.ts b/src/libs/GooglePlacesUtils.ts
index 6329939f31df..1f9fd838f8d4 100644
--- a/src/libs/GooglePlacesUtils.ts
+++ b/src/libs/GooglePlacesUtils.ts
@@ -33,7 +33,7 @@ function getAddressComponents(addressComponents: AddressComponent[], fieldsToExt
 }
 
 type AddressTerm = {value: string};
-type GetPlaceAutocompleteTermsResultKey = 'country' | 'state' | 'city' | 'street' | 'streetNumber';
+type GetPlaceAutocompleteTermsResultKey = 'country' | 'state' | 'city' | 'street';
 type GetPlaceAutocompleteTermsResult = Partial<Record<GetPlaceAutocompleteTermsResultKey, string>>;
 
 /**
@@ -41,7 +41,7 @@ type GetPlaceAutocompleteTermsResult = Partial<Record<GetPlaceAutocompleteTermsR
  * conform to the following ORDER: <street, city, state, country>
  */
 function getPlaceAutocompleteTerms(addressTerms: AddressTerm[]): GetPlaceAutocompleteTermsResult {
-    const fieldsToExtract: GetPlaceAutocompleteTermsResultKey[] = ['country', 'state', 'city', 'street', 'streetNumber'];
+    const fieldsToExtract: GetPlaceAutocompleteTermsResultKey[] = ['country', 'state', 'city', 'street'];
     const result: GetPlaceAutocompleteTermsResult = {};
     fieldsToExtract.forEach((fieldToExtract, index) => {
         const fieldTermIndex = addressTerms.length - (index + 1);
diff --git a/tests/unit/GooglePlacesUtilsTest.ts b/tests/unit/GooglePlacesUtilsTest.ts
index b3f448a46785..9a7649158c8f 100644
--- a/tests/unit/GooglePlacesUtilsTest.ts
+++ b/tests/unit/GooglePlacesUtilsTest.ts
@@ -85,7 +85,6 @@ describe('GooglePlacesUtilsTest', () => {
                 state: 'Bangladesh Border Road',
                 city: '',
                 street: '',
-                streetNumber: '',
             });
         });
     });