diff --git a/src/fmg-components/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
index 4e4cf6b56..a9e92ea40 100644
--- a/src/fmg-components/address-questions/address-questions.vue
+++ b/src/fmg-components/address-questions/address-questions.vue
@@ -452,12 +452,6 @@ export default {
             this.loadGooglePlacesAutocompleteScript();
         }
     },
-    beforeUpdate() {
-        // It is necessary to set focus on the street address on this lifecycle hook when this component is used in a modal.
-        if (!this.addressField1.matches(":focus")) {
-            this.addressField1.focus();
-        }
-    },
     unmounted() {
         this.unloadAutocomplete();
     },