diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index d858edae4..eabb1be4e 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -29,7 +29,7 @@
{{ 'core.date' | translate }}
+ [max]="maxDate" [min]="minDate" display-timezone="utc">
@@ -166,7 +166,8 @@
+ [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1"
+ display-timezone="utc">
diff --git a/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html b/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
index f6bcd38db..d0acc0ca8 100644
--- a/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
+++ b/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
@@ -1,7 +1,7 @@
+ [disabled]="searchMode && !searchFields!['f_'+field.id+'_z']" [displayFormat]="format" display-timezone="utc">