diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index e29639e09..6bc67a273 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -122,19 +122,15 @@ export default {
   },
   methods: {
     handleCheckedChanged(val) {
-      const newSelectedValues = this.selectedValues;
       if(this.isMultiSelect && this.selectedValues) {
         // Add or remove item to array of data to emit
+        const newSelectedValues = this.selectedValues;
         if(Array.isArray(this.selectedValues)) {
           val.checkValue ? newSelectedValues.push(val.value) : newSelectedValues.splice(newSelectedValues.indexOf(val.value), 1);
           this.selectedValues = newSelectedValues;  
         }
       } else {
-        if(this.isMultiSelect && this.selectedValues) {
-          newSelectedValues.splice(0,newSelectedValues.length);
-          newSelectedValues.push(val.value);
-          this.selectedValues = newSelectedValues; 
-        }
+        this.selectedValues = [val.value];
       }
     },
   },