diff --git a/NEWS b/NEWS
index eed67f94d..82530b7fc 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Enhancements
 Bug fixes
  - [web] properly handle Windows-1256 charaset (#4781)
  - [web] fixed saving value of receipt action for main IMAP account
+ - [web] fixed search results in Calendar module when targeting all events
 
 4.0.8 (2019-07-19)
 ------------------
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 6e6861d78..56a8d793f 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1626,7 +1626,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
           // replace the date range
           if (r)
             {
-              if ([baseWhere count] > 1)
+              if (dateSqlString)
                 [baseWhere removeLastObject];
               dateSqlString = [self _sqlStringRangeFrom: _startDate
                                                      to: endDate