diff --git a/app/webpacker/controllers/conditional_question_controller.js b/app/webpacker/controllers/conditional_question_controller.js
index 138efd2e9..41bb3c45a 100644
--- a/app/webpacker/controllers/conditional_question_controller.js
+++ b/app/webpacker/controllers/conditional_question_controller.js
@@ -16,15 +16,30 @@ export default class extends Controller {
     }
   }
 
+  clearTextNumericInput(input) {
+    input.value = ""
+  }
+
+  clearDateInputs(inputs) {
+    inputs.forEach((input) => { input.value = "" })
+  }
+
   displayConditionalRadio() {
     if(this.element.checked) {
       let selectedValue = this.element.value
       let conditional_for = JSON.parse(this.element.dataset.info)
       Object.entries(conditional_for).map(([targetQuestion, conditions]) => {
-        let input = document.getElementById(`case-log-${targetQuestion.replaceAll("_","-")}-field`)
-        if(conditions.includes(selectedValue)) {
-        } else {
-          input.value = ""
+          if(conditions.includes(selectedValue)) {
+          } else {
+            const textNumericInput = document.getElementById(`case-log-${targetQuestion.replaceAll("_","-")}-field`)
+            if (textNumericInput == null) {
+              const dateInputs = [1,2,3].map((idx) => {
+                return document.getElementById(`case_log_${targetQuestion}_${idx}i`)
+              })
+              this.clearDateInputs(dateInputs)
+            } else {
+              this.clearTextNumericInput(textNumericInput)
+          }
         }
       })
     }