diff --git a/controllers/EntryController.php b/controllers/EntryController.php
index 5ffd61db..fecbca49 100644
--- a/controllers/EntryController.php
+++ b/controllers/EntryController.php
@@ -544,10 +544,20 @@ public function actionDelete($id)
             throw new HttpException('403', Yii::t('CalendarModule.base', "You don't have permission to delete this event!"));
         }
 
-        $calendarEntry->delete();
+        if (!$calendarEntry->delete()) {
+            return Yii::$app->request->isAjax
+                ? $this->asJson([
+                    'success' => false,
+                    'message' => Yii::t('CalendarModule.base', 'Event could not be deleted!'),
+                ])
+                : $this->redirect(Url::toEntry($calendarEntry));
+        }
 
         return Yii::$app->request->isAjax
-            ? $this->asJson(['success' => true])
+            ? $this->asJson([
+                'success' => true,
+                'message' => Yii::t('CalendarModule.base', 'Event has been be deleted!'),
+            ])
             : $this->redirect(Url::toCalendar($this->contentContainer));
     }
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 77009fa9..62aa6579 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+1.6.2 (Unreleased)
+--------------------
+- Enh #495: Fix column `exdate` to delete more than 16 recurrence event entries
 
 1.6.1 (July 3, 2024)
 --------------------
diff --git a/migrations/m240716_075328_fix_exdate.php b/migrations/m240716_075328_fix_exdate.php
new file mode 100644
index 00000000..6b63f9fa
--- /dev/null
+++ b/migrations/m240716_075328_fix_exdate.php
@@ -0,0 +1,27 @@
+<?php
+
+use humhub\components\Migration;
+
+/**
+ * Class m240716_075328_fix_exdate
+ */
+class m240716_075328_fix_exdate extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->alterColumn('calendar_entry', 'exdate', $this->text()->null());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        echo "m240716_075328_fix_exdate cannot be reverted.\n";
+
+        return false;
+    }
+}
diff --git a/module.json b/module.json
index eb447bd4..2aebfb22 100644
--- a/module.json
+++ b/module.json
@@ -3,7 +3,7 @@
     "name": "Calendar",
     "description": "Create one-time or recurring events, invite and manage attendees, and keep track of all your events with the Calendar module.",
     "keywords": ["calendar"],
-    "version": "1.6.1",
+    "version": "1.6.2",
     "humhub": {
         "minVersion": "1.16.1"
     },
diff --git a/resources/js/humhub.calendar.js b/resources/js/humhub.calendar.js
index b20e0ee6..3eff8179 100644
--- a/resources/js/humhub.calendar.js
+++ b/resources/js/humhub.calendar.js
@@ -12,6 +12,7 @@ humhub.module('calendar', function (module, require, $) {
         var Content = require('content').Content;
         var event = require('event');
         var StreamEntry = require('stream').StreamEntry;
+        var status = require('ui.status');
 
         var Calendar = Widget.extend();
         var Form = Widget.extend();
@@ -325,10 +326,18 @@ humhub.module('calendar', function (module, require, $) {
             streamEntry.loader();
             modal.confirm().then(function (confirm) {
                 if (confirm) {
-                    client.post(evt).then(function () {
-                        modal.global.close();
+                    client.post(evt).then(function (response) {
+                        if (response.success) {
+                            status.success(response.message);
+                            modal.global.close();
+                        } else if (response.message) {
+                            status.error(response.message);
+                        }
                     }).catch(function (e) {
                         module.log.error(e, true);
+                        if (e.message) {
+                            status.error(e.message);
+                        }
                     });
                 } else {
                     var streamEntry = Widget.closest(evt.$trigger);
diff --git a/resources/js/humhub.calendar.min.js b/resources/js/humhub.calendar.min.js
index 935f1cb8..ec82b8c8 100644
--- a/resources/js/humhub.calendar.min.js
+++ b/resources/js/humhub.calendar.min.js
@@ -1 +1 @@
-humhub.module("calendar",function(o,t,l){var i=t("ui.widget").Widget,r=t("client"),a=t("ui.modal"),d=t("action"),n=t("content").Content,c=t("event"),s=t("stream").StreamEntry,u=i.extend(),f=i.extend();f.RECUR_EDIT_MODE_CREATE=0,f.RECUR_EDIT_MODE_THIS=1,f.RECUR_EDIT_MODE_FOLLOWING=2,f.RECUR_EDIT_MODE_ALL=3,f.prototype.init=function(){a.global.$.find(".tab-basic").on("shown.bs.tab",function(t){l("#calendarentry-title").focus()}),a.global.$.find(".tab-participation").on("shown.bs.tab",function(t){l("#calendarentry-participation_mode").focus()}),this.initDateTimeCorrector(),this.initTimeInput(),this.initSubmitAction()},f.prototype.initDateTimeCorrector=function(){function n(t){t=t.split(":");var e=parseInt(t[0]);return 12===e&&t[1].includes("AM")?e=0:e+=t[1].includes("PM")&&e<12?12:0,60*e+parseInt(t[1])}function o(){return{start:l(r+"date").datepicker("getDate").getTime(),end:l(a+"date").datepicker("getDate").getTime()}}function e(t,e,n){var o,i,r,a,d=1440;if(e<0||d<=e){var c=new Date(l(t+"date").datepicker("getDate"));c.setDate(c.getDate()+(e<0?-1:1)),l(t+"date").datepicker("setDate",c),e+=e<0?d:-d}l(t+"time").val((r=((o=e)-(i=o%60))/60,a="","12h"===n&&(a=r<12?" AM":" PM",0===r?r=12:12<r&&(r-=12)),r<10&&(r="0"+r),i<10&&(i="0"+i),r+":"+i+a))}function i(){var t=o();if(t.start!==t.end)return!0;var e={start:n(l(r+"time").val()),end:n(l(a+"time").val()),mode:l(r+"time").val().includes("M")?"12h":"24h"};return!(e.end<=e.start)||e}var r="#calendarentryform-start_",a="#calendarentryform-end_";this.$.find(r+"time").on("change",function(){var t=i();!0!==t&&e(a,t.start+60,t.mode)}),this.$.find(a+"time").on("change",function(){var t=i();!0!==t&&e(r,t.end-60,t.mode)});function t(){var t=o();return t.start<=t.end}this.$.find(r+"date").on("change",function(){t()||l(a+"date").val(l(r+"date").val())}),this.$.find(a+"date").on("change",function(){t()||l(r+"date").val(l(a+"date").val())})},f.prototype.setEditMode=function(t){var e=t.$trigger.data("editMode");e==f.RECUR_EDIT_MODE_THIS?l(".field-calendarentryform-is_public").hide():l(".field-calendarentryform-is_public").show(),this.$.find(".calendar-edit-mode-back").show(),this.$.find(".recurrence-edit-type").hide(),this.$.find(".calendar-entry-form-tabs").show(),this.$.find("#recurrenceEditMode").val(e)},f.prototype.showEditModes=function(t){this.$.find(".calendar-edit-mode-back").hide(),this.$.find(".recurrence-edit-type").show(),this.$.find(".calendar-entry-form-tabs").hide()},f.prototype.initTimeInput=function(){a.global.$.find(".timeField").find(".form-control").each(function(){var t=l(this);t.prop("disabled")&&t.data("oldVal",t.val()).val("")})},f.prototype.initSubmitAction=function(){a.global.$.one("submitted",p)};var p=function(t,e){e.id&&a.global.$.one("hidden.bs.modal",function(){var t=s.getNodeByKey(e.id);t.length&&(t=new s(t)).reload()}),e.reloadWall?(c.trigger("humhub:content:newEntry",e.content,this),c.trigger("humhub:content:afterSubmit",e.content,this)):a.global.$.one("submitted",p)};f.prototype.toggleDateTime=function(t){var e=a.global.$.find(".timeField"),n=e.find(".form-control"),o=a.global.$.find(".timeZoneField");t.$trigger.prop("checked")?(n.prop("disabled",!0),n.each(function(){l(this).data("oldVal",l(this).val()).val("")}),e.css("opacity","0.2"),o.hide()):(n.each(function(){var t=l(this);t.data("oldVal")&&t.val(t.data("oldVal"))}),n.prop("disabled",!1),e.css("opacity","1.0"),o.show())},f.prototype.changeTimezone=function(t){var e=this.$.find(".timeZoneInput");this.$.find(".calendar-timezone").text(e.find("option:selected").text()),e.hide()},f.prototype.toggleTimezoneInput=function(t){this.$.find(".timeZoneInput").fadeToggle()},f.prototype.changeEventType=function(t){var e=t.$trigger.find(":selected");e.data("color")&&(l(".colorpicker-element").data("colorpicker").color.setColor(e.data("color")),l(".colorpicker-element").data("colorpicker").update())},f.prototype.toggleRecurring=function(t){l(".calendar-entry-form-tabs .tab-recurrence").parent().toggle(t.$trigger.is(":checked"))},f.prototype.toggleReminder=function(t){l(".calendar-entry-form-tabs .tab-reminder").parent().toggle(t.$trigger.is(":checked"))};var h=n.extend();h.prototype.toggleClose=function(t){this.update(r.post(t))},h.prototype.reload=function(t){return this.parent().reload()},h.prototype.update=function(t){this.loader(),t.then(l.proxy(this.handleUpdateSuccess,this)).catch(h.handleUpdateError).finally(l.proxy(this.loader,this,!1))},h.prototype.loader=function(t){this.streamEntry().loader(t)},h.prototype.handleUpdateSuccess=function(t){return this.streamEntry().replace(t.output).catch(function(t){o.log.error(t,!0)})},h.handleUpdateError=function(t){o.log.error(t,!0)},h.prototype.streamEntry=function(){return this.parent()};var g=function(){return i.instance("#calendar")};o.export({Calendar:u,respond:function(n){n.block=d.BLOCK_MANUAL,r.post(n).then(function(t){t.success?i.closest(n.$trigger).reload().then(function(){o.log.success("saved")}):(o.log.error(e,!0),n.finish())}).catch(function(t){o.log.error(t,!0),n.finish()})},editModal:function(t){a.load(t).then(function(t){a.global.$.one("submitted",function(){var t=g();t&&t.fetch()})}).catch(function(t){o.log.error(t,!0)})},deleteEvent:function(e){i.closest(e.$trigger).loader(),a.confirm().then(function(t){t?r.post(e).then(function(){a.global.close()}).catch(function(t){o.log.error(t,!0)}):i.closest(e.$trigger).loader(!1)}).finally(function(){e.finish()})},CalendarEntry:h,Form:f})});
\ No newline at end of file
+humhub.module("calendar",function(o,t,l){var i=t("ui.widget").Widget,r=t("client"),a=t("ui.modal"),c=t("action"),n=t("content").Content,d=t("event"),s=t("stream").StreamEntry,u=t("ui.status"),f=i.extend(),p=i.extend();p.RECUR_EDIT_MODE_CREATE=0,p.RECUR_EDIT_MODE_THIS=1,p.RECUR_EDIT_MODE_FOLLOWING=2,p.RECUR_EDIT_MODE_ALL=3,p.prototype.init=function(){a.global.$.find(".tab-basic").on("shown.bs.tab",function(t){l("#calendarentry-title").focus()}),a.global.$.find(".tab-participation").on("shown.bs.tab",function(t){l("#calendarentry-participation_mode").focus()}),this.initDateTimeCorrector(),this.initTimeInput(),this.initSubmitAction()},p.prototype.initDateTimeCorrector=function(){function n(t){t=t.split(":");var e=parseInt(t[0]);return 12===e&&t[1].includes("AM")?e=0:e+=t[1].includes("PM")&&e<12?12:0,60*e+parseInt(t[1])}function o(){return{start:l(r+"date").datepicker("getDate").getTime(),end:l(a+"date").datepicker("getDate").getTime()}}function e(t,e,n){var o,i,r,a,c=1440;if(e<0||c<=e){var d=new Date(l(t+"date").datepicker("getDate"));d.setDate(d.getDate()+(e<0?-1:1)),l(t+"date").datepicker("setDate",d),e+=e<0?c:-c}l(t+"time").val((r=((o=e)-(i=o%60))/60,a="","12h"===n&&(a=r<12?" AM":" PM",0===r?r=12:12<r&&(r-=12)),r<10&&(r="0"+r),i<10&&(i="0"+i),r+":"+i+a))}function i(){var t=o();if(t.start!==t.end)return!0;var e={start:n(l(r+"time").val()),end:n(l(a+"time").val()),mode:l(r+"time").val().includes("M")?"12h":"24h"};return!(e.end<=e.start)||e}var r="#calendarentryform-start_",a="#calendarentryform-end_";this.$.find(r+"time").on("change",function(){var t=i();!0!==t&&e(a,t.start+60,t.mode)}),this.$.find(a+"time").on("change",function(){var t=i();!0!==t&&e(r,t.end-60,t.mode)});function t(){var t=o();return t.start<=t.end}this.$.find(r+"date").on("change",function(){t()||l(a+"date").val(l(r+"date").val())}),this.$.find(a+"date").on("change",function(){t()||l(r+"date").val(l(a+"date").val())})},p.prototype.setEditMode=function(t){var e=t.$trigger.data("editMode");e==p.RECUR_EDIT_MODE_THIS?l(".field-calendarentryform-is_public").hide():l(".field-calendarentryform-is_public").show(),this.$.find(".calendar-edit-mode-back").show(),this.$.find(".recurrence-edit-type").hide(),this.$.find(".calendar-entry-form-tabs").show(),this.$.find("#recurrenceEditMode").val(e)},p.prototype.showEditModes=function(t){this.$.find(".calendar-edit-mode-back").hide(),this.$.find(".recurrence-edit-type").show(),this.$.find(".calendar-entry-form-tabs").hide()},p.prototype.initTimeInput=function(){a.global.$.find(".timeField").find(".form-control").each(function(){var t=l(this);t.prop("disabled")&&t.data("oldVal",t.val()).val("")})},p.prototype.initSubmitAction=function(){a.global.$.one("submitted",h)};var h=function(t,e){e.id&&a.global.$.one("hidden.bs.modal",function(){var t=s.getNodeByKey(e.id);t.length&&(t=new s(t)).reload()}),e.reloadWall?(d.trigger("humhub:content:newEntry",e.content,this),d.trigger("humhub:content:afterSubmit",e.content,this)):a.global.$.one("submitted",h)};p.prototype.toggleDateTime=function(t){var e=a.global.$.find(".timeField"),n=e.find(".form-control"),o=a.global.$.find(".timeZoneField");t.$trigger.prop("checked")?(n.prop("disabled",!0),n.each(function(){l(this).data("oldVal",l(this).val()).val("")}),e.css("opacity","0.2"),o.hide()):(n.each(function(){var t=l(this);t.data("oldVal")&&t.val(t.data("oldVal"))}),n.prop("disabled",!1),e.css("opacity","1.0"),o.show())},p.prototype.changeTimezone=function(t){var e=this.$.find(".timeZoneInput");this.$.find(".calendar-timezone").text(e.find("option:selected").text()),e.hide()},p.prototype.toggleTimezoneInput=function(t){this.$.find(".timeZoneInput").fadeToggle()},p.prototype.changeEventType=function(t){var e=t.$trigger.find(":selected");e.data("color")&&(l(".colorpicker-element").data("colorpicker").color.setColor(e.data("color")),l(".colorpicker-element").data("colorpicker").update())},p.prototype.toggleRecurring=function(t){l(".calendar-entry-form-tabs .tab-recurrence").parent().toggle(t.$trigger.is(":checked"))},p.prototype.toggleReminder=function(t){l(".calendar-entry-form-tabs .tab-reminder").parent().toggle(t.$trigger.is(":checked"))};var g=n.extend();g.prototype.toggleClose=function(t){this.update(r.post(t))},g.prototype.reload=function(t){return this.parent().reload()},g.prototype.update=function(t){this.loader(),t.then(l.proxy(this.handleUpdateSuccess,this)).catch(g.handleUpdateError).finally(l.proxy(this.loader,this,!1))},g.prototype.loader=function(t){this.streamEntry().loader(t)},g.prototype.handleUpdateSuccess=function(t){return this.streamEntry().replace(t.output).catch(function(t){o.log.error(t,!0)})},g.handleUpdateError=function(t){o.log.error(t,!0)},g.prototype.streamEntry=function(){return this.parent()};var m=function(){return i.instance("#calendar")};o.export({Calendar:f,respond:function(n){n.block=c.BLOCK_MANUAL,r.post(n).then(function(t){t.success?i.closest(n.$trigger).reload().then(function(){o.log.success("saved")}):(o.log.error(e,!0),n.finish())}).catch(function(t){o.log.error(t,!0),n.finish()})},editModal:function(t){a.load(t).then(function(t){a.global.$.one("submitted",function(){var t=m();t&&t.fetch()})}).catch(function(t){o.log.error(t,!0)})},deleteEvent:function(e){i.closest(e.$trigger).loader(),a.confirm().then(function(t){t?r.post(e).then(function(t){t.success?(u.success(t.message),a.global.close()):t.message&&u.error(t.message)}).catch(function(t){o.log.error(t,!0),t.message&&u.error(t.message)}):i.closest(e.$trigger).loader(!1)}).finally(function(){e.finish()})},CalendarEntry:g,Form:p})});
\ No newline at end of file