diff --git a/src/components/AddressSearch.js b/src/components/AddressSearch.js
index 058835df5482..158e3829779b 100644
--- a/src/components/AddressSearch.js
+++ b/src/components/AddressSearch.js
@@ -41,7 +41,6 @@ const defaultProps = {
 const AddressSearch = (props) => {
     const googlePlacesRef = useRef();
     const [displayListViewBorder, setDisplayListViewBorder] = useState(false);
-    const [isSelected, setIsSelected] = useState(true);
     useEffect(() => {
         if (!googlePlacesRef.current) {
             return;
@@ -87,17 +86,10 @@ const AddressSearch = (props) => {
         <GooglePlacesAutocomplete
             ref={googlePlacesRef}
             fetchDetails
-            onBlur={() => {
-                if (isSelected) {
-                    return;
-                }
-                googlePlacesRef.current.setAddressText('');
-            }}
             suppressDefaultStyles
             enablePoweredByContainer={false}
             onPress={(data, details) => {
                 saveLocationDetails(details);
-                setIsSelected(true);
 
                 // After we select an option, we set displayListViewBorder to false to prevent UI flickering
                 setDisplayListViewBorder(false);
@@ -117,15 +109,8 @@ const AddressSearch = (props) => {
                 label: props.label,
                 containerStyles: props.containerStyles,
                 errorText: props.errorText,
-                onKeyPress: (event) => {
-                    if (event.key !== 'Tab' || isSelected) {
-                        return;
-                    }
-                    googlePlacesRef.current.setAddressText('');
-                },
                 onChangeText: (text) => {
                     const isTextValid = !_.isEmpty(text) && _.isEqual(text, props.value);
-                    setIsSelected(false);
 
                     // Ensure whether an address is selected already or has address value initialized.
                     if (!_.isEmpty(googlePlacesRef.current.getAddressText()) && !isTextValid) {