diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 4c130e08..fd05174d 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -81,7 +81,6 @@ describe('modal.vue', () => {
             validate: mockValidate(true)
         });
 
-        const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText,
@@ -89,7 +88,6 @@ describe('modal.vue', () => {
             },
             attachTo: document.body
         });
-        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Act
         const buttonMain = wrapper.findComponent({ ref: 'modalButtonMain' });
@@ -112,8 +110,6 @@ describe('modal.vue', () => {
             meta: mockMeta(fakeMeta),
             validate: mockValidate(false)
         });
-
-        const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText,
@@ -121,7 +117,6 @@ describe('modal.vue', () => {
             },
             attachTo: document.body
         });
-        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Act
         const buttonMain = wrapper.findComponent({ ref: 'modalButtonMain' });
@@ -144,8 +139,6 @@ describe('modal.vue', () => {
             meta: mockMeta(fakeMeta),
             validate: mockValidate(true)
         });
-
-        const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText,
@@ -153,7 +146,6 @@ describe('modal.vue', () => {
             },
             attachTo: document.body
         });
-        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Assert
         expect(wrapper.vm.isFooterButtonDisabled).toBe(true);
@@ -172,8 +164,6 @@ describe('modal.vue', () => {
             meta: mockMeta(fakeMeta),
             validate: mockValidate(true)
         });
-
-        const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText,
@@ -181,7 +171,6 @@ describe('modal.vue', () => {
             },
             attachTo: document.body
         });
-        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Assert
         expect(wrapper.vm.isFooterButtonDisabled).toBe(true);
@@ -202,8 +191,6 @@ describe('modal.vue', () => {
         });
 
         const showMock = jest.spyOn(Modal.prototype, 'show');
-
-        const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText,
@@ -211,7 +198,6 @@ describe('modal.vue', () => {
             },
             attachTo: document.body
         });
-        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Act
         wrapper.vm.openModal();
@@ -234,8 +220,6 @@ describe('modal.vue', () => {
             validate: mockValidate(true)
         });
         const hideMock = jest.spyOn(Modal.prototype, 'hide');
-
-        const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText,
@@ -243,7 +227,6 @@ describe('modal.vue', () => {
             },
             attachTo: document.body
         });
-        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         // Act
         wrapper.vm.openModal();
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0ab74b24..97f18ee6 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -115,8 +115,6 @@ export default {
             const validationResult = await this.validate();
             if (validationResult.valid) {
                 this.$emit('footer-button-event');
-            } else {
-                this.resetButtonStyle();
             }
         },
         async onKeyDown(e) {
@@ -125,14 +123,10 @@ export default {
             this.$refs.modalButtonMain.clicked();
             document.getElementById(this.modalId)?.focus();
         },
-        resetButtonStyle() {
-            this.$refs.modalButtonMain?.resetButtonStyle();
-        },
         onModalOpened() {
             this.onModalOpenedCallback?.();
         },
         onModalClosed() {
-            this.resetButtonStyle();
             this.onModalClosedCallback?.();
         },
         openModal() {
diff --git a/src/iss-components/button-question-modal/button-question-modal.vue b/src/iss-components/button-question-modal/button-question-modal.vue
index 76260a7f..14070bc9 100644
--- a/src/iss-components/button-question-modal/button-question-modal.vue
+++ b/src/iss-components/button-question-modal/button-question-modal.vue
@@ -5,8 +5,7 @@
         class="modal fade modal-component"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
-        aria-hidden="true"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle }">
+        aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
                 <div class="modal-header">
@@ -69,9 +68,6 @@ export default {
         }
     },
     methods: {
-        resetButtonStyle() {
-            this.$refs.buttonMain.resetButtonStyle();
-        }
     }
 };
 </script>
diff --git a/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-modal.vue b/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-modal.vue
index fb53470f..9141b32e 100644
--- a/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-modal.vue
+++ b/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-modal.vue
@@ -101,7 +101,6 @@ export default {
                 this.$refs[this.ModalName]?.closeModal();
                 this.$emit('buttonClick');
             } else {
-                this.$refs[this.ModalName]?.resetButtonStyle();
                 this.showError = true;
             }
         }
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index dd6df70d..9647c322 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -260,9 +260,6 @@ export default {
             this.displayInvalidZipAlert = false;
             this.internalModel = deepClone(this.modelValue);
         },
-        resetModalButtonStyle() {
-            this.modal.resetButtonStyle();
-        },
         async setMobileLocation() {
             if (
                 this.internalModel.addressQuestions.zipCode
@@ -273,7 +270,6 @@ export default {
 
                 if (!zipCodeData.isValid) {
                     this.displayInvalidZipAlert = true;
-                    this.resetModalButtonStyle();
                 } else {
                     // retrieve mobile fee part
                     const serviceZipCode = this.internalModel.addressQuestions.zipCode;
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index c303c838..8029dc06 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -10,8 +10,7 @@ jest.mock('@/digital-components/textbox-question/textbox-question', () => ({
 
 jest.mock('@/digital-components/modal/modal', () => ({
     methods: {
-        closeModal: jest.fn(),
-        resetButtonStyle: jest.fn()
+        closeModal: jest.fn()
     }
 }));
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index c0cd4da3..a537526a 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -127,9 +127,6 @@ export default {
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-        resetModalButtonStyle() {
-            this.$refs[this.modalName].resetButtonStyle();
-        },
         onInputIdAssigned(inputId) {
             this.serviceZipCodeTextInputId = inputId;
         },
@@ -150,7 +147,6 @@ export default {
                 if (!zipCodeData.isValid) {
                     this.displayInvalidZipAlert = true;
                     this.focusOnZipInput();
-                    this.resetModalButtonStyle();
                 } else {
                     this.internalModel.state = zipCodeData.state;
                     const serviceZipCode = this.internalModel.zipCode;