diff --git a/app/webpacker/controllers/flatpickr_controller.js b/app/webpacker/controllers/flatpickr_controller.js
index b6c619c859..1f20ba505d 100644
--- a/app/webpacker/controllers/flatpickr_controller.js
+++ b/app/webpacker/controllers/flatpickr_controller.js
@@ -62,7 +62,7 @@ export default class extends Flatpickr {
   }
 
   change(selectedDates, dateStr, instance) {
-    if (this.hasStartTarget && this.hasEndTarget) {
+    if (this.hasStartTarget && this.hasEndTarget && this.modeValue == "range") {
       this.startTarget.value = selectedDates[0]
         ? this.fp.formatDate(selectedDates[0], this.config.dateFormat)
         : "";
@@ -78,6 +78,11 @@ export default class extends Flatpickr {
     }
   }
 
+  close() {
+    // Send a change event to the input element to trigger the ng-change
+    this.hasEndTarget && this.endTarget.dispatchEvent(new Event("change"));
+  }
+
   // private
 
   plugins = (mode, datetimepicker) => {