diff --git a/src/components/AddressSearch/index.js b/src/components/AddressSearch/index.js
index 4e9f9ddaf696..61460a93650e 100644
--- a/src/components/AddressSearch/index.js
+++ b/src/components/AddressSearch/index.js
@@ -229,6 +229,7 @@ function AddressSearch(props) {
             street2: subpremise,
             // Make sure country is updated first, since city and state will be reset if the country changes
             country: '',
+            state: state || stateAutoCompleteFallback,
             // When locality is not returned, many countries return the city as postalTown (e.g. 5 New Street
             // Square, London), otherwise as sublocality (e.g. 384 Court Street Brooklyn). If postalTown is
             // returned, the sublocality will be a city subdivision so shouldn't take precedence (e.g.
@@ -236,7 +237,6 @@ function AddressSearch(props) {
             city: locality || postalTown || sublocality || cityAutocompleteFallback,
             zipCode,
 
-            state: state || stateAutoCompleteFallback,
             lat: lodashGet(details, 'geometry.location.lat', 0),
             lng: lodashGet(details, 'geometry.location.lng', 0),
             address: lodashGet(details, 'formatted_address', ''),