diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index 2c4152cfa..ddb81b531 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -9,7 +9,6 @@
             :buttonText="buttonText"
             loaderColor="white"
             :class="isForwardActionDisabled && 'form-test-invalid'"
-            :aria-disabled="isForwardActionDisabled"
             :isDisabled="isForwardActionDisabled"
             @click-event="buttonClick"
             data-bs-target="#footerModal"
@@ -85,6 +84,7 @@ export default {
       };
     },
     buttonClick() {
+      if (this.isForwardActionDisabled) { return false }
       //prevent keyboard input after button click
       document.onkeydown = function (e) {
         return false;
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 8396351f8..345dbbe0f 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -1,6 +1,5 @@
 <template>
   <button
-    :aria-disabled="isDisabled"
     class="btn d-flex align-items-center py-3 px-4 delay"
     :class="[isPrimary ? 'btn-primary' : 'btn-secondary',isFloat ? 'float-end' : '', isLoaderDisplayed ? 'has-loader' : '']"
     @click="clicked()"