diff --git a/app/javascript/controllers/conditional_question_controller.js b/app/javascript/controllers/conditional_question_controller.js
index b316bd329..53293543d 100644
--- a/app/javascript/controllers/conditional_question_controller.js
+++ b/app/javascript/controllers/conditional_question_controller.js
@@ -21,7 +21,7 @@ export default class extends Controller {
       let selectedValue = this.element.value
       let conditional_for = JSON.parse(this.element.dataset.info)
 
-      Object.entries(conditional_for).forEach(([targetQuestion, conditions]) => {
+      Object.entries(conditional_for).map(([targetQuestion, conditions]) => {
         let div = document.getElementById(targetQuestion + "_div")
         if(conditions.includes(selectedValue)) {
           div.style.display = "block"
@@ -31,7 +31,7 @@ export default class extends Controller {
           if (buttons.length == 0){
             buttons = document.getElementsByName(`case_log[${targetQuestion}][]`);
           }
-          Object.entries(buttons).forEach(([idx, button]) => {
+          Object.entries(buttons).map(([idx, button]) => {
             button.checked = false;
           })
         }
@@ -43,7 +43,7 @@ export default class extends Controller {
     let enteredValue = this.element.value
     let conditional_for = JSON.parse(this.element.dataset.info)
 
-    Object.entries(conditional_for).forEach(([targetQuestion, condition]) => {
+    Object.entries(conditional_for).map(([targetQuestion, condition]) => {
       let div = document.getElementById(targetQuestion + "_div")
       if(eval((enteredValue + condition))) {
         div.style.display = "block"
diff --git a/app/javascript/controllers/soft_validations_controller.js b/app/javascript/controllers/soft_validations_controller.js
index 91321e548..963dd7a76 100644
--- a/app/javascript/controllers/soft_validations_controller.js
+++ b/app/javascript/controllers/soft_validations_controller.js
@@ -18,7 +18,7 @@ export default class extends Controller {
         } else {
           div.style.display = "none"
           let buttons = document.getElementsByName(`case_log[override_net_income_validation][]`)
-          Object.entries(buttons).forEach(([idx, button]) => {
+          Object.entries(buttons).map(([idx, button]) => {
             button.checked = false
           })
         }