diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 1a5a38ba..24d7bd67 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -621,7 +621,7 @@ function rcube_calendar_ui(settings)
           data.attendees = [];
         
         // tell server to send notifications
-        if (data.attendees.length && organizer && ((event.id && notify.checked) || (!event.id && invite.checked))) {
+        if ((data.attendees.length || (event.id && event.attendees.length)) && organizer && (notify.checked || invite.checked)) {
           data._notify = 1;
         }