diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 1ea62829..bd7d5796 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -34,7 +34,6 @@
                         loaderColor="white"
                         :buttonText="footerButtonText"
                         :class="(isButtonDisabled || isFooterButtonDisabled) && 'form-test-invalid'"
-                        :isDisabled="(isButtonDisabled || isFooterButtonDisabled)"
                         @clickEvent="validateAndEmit" />
                 </div>
             </div>
diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss
index e1955587..39bc12d2 100644
--- a/src/styles/client-customizations.scss
+++ b/src/styles/client-customizations.scss
@@ -27,17 +27,18 @@ $limu-button-color: #A9E3E9;
     }
 
     .btn {
-        &.btn-override[aria-disabled="false"]{
+        &.btn-override[aria-disabled="false"]:not(.form-test-invalid) {
             &.btn-primary {
                 background: $limu-button-color !important;
                 color: $limu-button-text-color !important;
             }
+
             &:focus-visible {
                 background: $limu-button-color !important;
                 color: $limu-button-text-color !important;
                 box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $limu-button-color !important;
             }
-            
+
         }
     }