diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 1c78ccc6c..1550b2a9c 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -36,4 +36,6 @@
 	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-month-event: 0;
 	--fhc-calendar-radius-list-event: var(--fhc-calendar-radius-event);
+
+	--fhc-calendar-maxheight-allday: 7.125rem;
 }
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index e5ed19385..d17cc06b4 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -89,6 +89,10 @@
 .fhc-calendar-base-grid .grid-allday .all-day-events {
 	background-color: var(--fhc-calendar-bg-allday);
 }
+.fhc-calendar-base-grid .grid-allday .all-day-events {
+	max-height: var(--fhc-calendar-maxheight-allday);
+	overflow-y: auto;
+}
 .fhc-calendar-base-grid .grid-main {
 	grid-gap: var(--fhc-calendar-gap, 1px);
 	background-color: var(--fhc-calendar-bg-body-gap, var(--fhc-calendar-bg-gap));
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 0a2066d0c..d773a52ed 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -35,18 +35,20 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
 		},
 		start_time: function () {
-			if (!this.event.start) return 'N/A';
-			if (!(this.event.start instanceof Date)) {
-				return this.event.start;
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!(this.event.beginn instanceof Date)) {
+				return this.event.beginn;
 			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
 		},
 		end_time: function () {
-			if (!this.event.end) return 'N/A';
-			if (!(this.event.end instanceof Date)) {
-				return this.event.end;
+			if (!this.event.ende)
+				return 'N/A';
+			if (!(this.event.ende instanceof Date)) {
+				return this.event.ende;
 			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
 	methods: {
@@ -88,6 +90,14 @@ export default {
 						}}</th>
 						<td>{{methodFormatDate(event.datum)}}</td>
 					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('global','raum')?
@@ -122,14 +132,6 @@ export default {
 							</div>
 						</td>
 					</tr>
-					<tr>
-						<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-						<td>{{start_time + ' - ' + end_time}}</td>
-					</tr>
 					<tr>
 						<th>{{
 							$p.t('lehre','organisationseinheit')?
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 571bbde29..66428e37f 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -32,18 +32,20 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
 		},
 		start_time: function () {
-			if (!this.event.start) return 'N/A';
-			if (!this.event.start instanceof Date) {
-				return this.event.start;
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!this.event.beginn instanceof Date) {
+				return this.event.beginn;
 			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
 		},
 		end_time: function () {
-			if (!this.event.end) return 'N/A';
-			if (!this.event.end instanceof Date) {
-				return this.event.end;
+			if (!this.event.ende)
+				return 'N/A';
+			if (!this.event.ende instanceof Date) {
+				return this.event.ende;
 			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
 	methods: {
@@ -69,6 +71,14 @@ export default {
 						}}</th>
 						<td>{{methodFormatDate(event.datum)}}</td>
 					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('global','raum')?
@@ -93,15 +103,6 @@ export default {
 							</div>
 						</td>
 					</tr>
-					<tr>
-						<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-						<td>{{start_time + ' - ' + end_time}}</td>
-					</tr>
-					
 				</tbody>
 		</table>