diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 8082107bd5..07125a6faa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -158,8 +158,10 @@
                 validate_date( dateText, instance );
                 var thisInput = instance.input;
                 if ( thisInput.hasAttribute('data-date_to') ) {
-                    var endPicker = document.querySelector("#"+thisInput.dataset.date_to)._flatpickr;
-                    endPicker.set('minDate', selectedDates[0]);
+                    var endPickerEl = document.querySelector("#"+thisInput.dataset.date_to);
+                    if (endPickerEl && endPickerEl._flatpickr) {
+                        endPickerEl._flatpickr.set('minDate', selectedDates[0]);
+                    }
                 }
 
                 let = on_close_focus = $(thisInput).data('flatpickr-on-close-focus');
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue
index b8d89d9f36..4b72d2282b 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitleResource.vue
@@ -416,6 +416,7 @@ export default {
                             name: "started_on",
                             type: "date",
                             label: $__("Start date"),
+                            indexRequired: true,
                             componentProps: {
                                 date_to: {
                                     type: "string",
@@ -428,6 +429,7 @@ export default {
                             name: "ended_on",
                             type: "date",
                             label: $__("End date"),
+                            indexRequired: true,
                         },
                         {
                             name: "proxy",