diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index cfdbbe4a26..7c3ccc7e01 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4519,7 +4519,7 @@ export class CalendarApp extends EgwApp
( typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0,-1),
( typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0,-1),
{
- participants:Object.keys(_data.participants).filter(v => {return v.match(/^[0-9|e|c]/)})
+ participants: Object.keys(_data.participants ?? []).filter(v => {return v.match(/^[0-9|e|c]/)})
}], function(_value){
if (_value)
{
diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts
index 0d512ff39a..ef2aabcbdc 100644
--- a/calendar/js/et2_widget_event.ts
+++ b/calendar/js/et2_widget_event.ts
@@ -554,10 +554,11 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
{
// Click handler is set in _bind_videoconference()
location += (this.options.value.location.trim() ? '
' : '') +
- '' +
- this.egw().lang('Video conference') +
+ '' +
+ this.egw().lang('Video conference') +
'';
this._bind_videoconference();
}
@@ -726,8 +727,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
jQuery('body').off(vc_event)
.on(vc_event, '[data-videoconference]', function (event)
{
- let data = egw.dataGetUIDdata("calendar::" + this.dataset.id);
- app.calendar.joinVideoConference(this.dataset.videoconference, data.data || this.dataset);
+ let data = egw.dataGetUIDdata("calendar::" + this.dataset.app_id);
+ app.calendar.joinVideoConference(this.dataset.videoconference, data?.data || this.dataset);
});
}