diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue
index 05409f738..af604ed99 100644
--- a/src/common-components/funnel-footer/funnel-footer.vue
+++ b/src/common-components/funnel-footer/funnel-footer.vue
@@ -24,6 +24,7 @@
             sizeInRem="1"
             :class="isDisabled && 'form-test-invalid'"
             :aria-disabled="isDisabled"
+            :isDisabled="isDisabled"
             @click-event="buttonClick"
           />
         </div>
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 975babe17..e14c29f9c 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
-    :disabled="isDisabled"
     :aria-disabled="isDisabled"
     class="btn d-flex align-items-center py-3 px-2"
     :class="[isPrimary ? 'btn-primary' : 'btn-secondary',isFloat ? 'float-end' : '']"
@@ -27,7 +26,7 @@ export default {
     loaderColor: String,
     loaderPosition: String,
     sizeInRem: [Number, String],
-    isFloat: Boolean
+    isFloat: Boolean,
   },
   data() {
     return {
@@ -36,8 +35,10 @@ export default {
   },
   methods: {
     clicked() {
-      this.isLoaderDisplayed = true;
-      this.$emit("click-event");
+      if (!this.isDisabled) {
+        this.isLoaderDisplayed = true;
+        this.$emit("click-event");
+      }
     },
   },
   components: {