diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
index 6bff2d865..30a69127e 100644
--- a/Documentation/SOGoInstallationGuide.asciidoc
+++ b/Documentation/SOGoInstallationGuide.asciidoc
@@ -1528,6 +1528,9 @@ URL could be set to something like:
 
 See the "EMail reminders" section in this document for more information.
 
+|S |SOGoDisableOrganizerEventCheck
+|Parameter used to disable organizer's calendar event check
+
 |S |OCSStoreURL
 |Parameter used to set the database URL so that SOGo can use to store
 all content data. You must also set `OCSAclURL` and `OCSCacheFolderURL`
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index bd70a7695..39f07a0b3 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -52,6 +52,7 @@
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/WORequest+SOGo.h>
+#import <SOGo/SOGoSystemDefaults.h>
 
 #import "iCalCalendar+SOGo.h"
 #import "iCalEvent+SOGo.h"
@@ -2580,7 +2581,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 
           // Verify if the event is still present in the organizer calendar
           organizerUID = [[masterEvent organizer] uidInContext: context];
-          if (organizerUID)
+          if (organizerUID && ![[SOGoSystemDefaults sharedSystemDefaults] disableOrganizerEventCheck])
             {
               object = [self _lookupEvent: [masterEvent uid]
                                    forUID: organizerUID];
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 0c916b0c8..adcf9f070 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -50,6 +50,8 @@
 
 - (BOOL) enableEMailAlarms;
 
+- (BOOL) disableOrganizerEventCheck;
+
 - (NSString *) faviconRelativeURL;
 - (NSString *) zipPath;
 - (int) port;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 7903e9a5b..6ad003906 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -384,6 +384,12 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return [self boolForKey: @"SOGoEnableEMailAlarms"];
 }
 
+- (BOOL) disableOrganizerEventCheck
+{
+  return [self boolForKey: @"SOGoDisableOrganizerEventCheck"];
+}
+
+
 - (NSString *) faviconRelativeURL
 {
   return [self stringForKey: @"SOGoFaviconRelativeURL"];
@@ -785,4 +791,5 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return secret;
 }
 
+
 @end