diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m
index 40a0aa20fb..86881aad7a 100644
--- a/ActiveSync/iCalEvent+ActiveSync.m
+++ b/ActiveSync/iCalEvent+ActiveSync.m
@@ -128,7 +128,7 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
   // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
   if ([self startDate])
     {
-      if ([self isAllDay] && !tz)
+      if ([self isAllDay] && !tz && [[context objectForKey: @"ASProtocolVersion"] floatValue] < 16.0)
         [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
            [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
                                           hours: 0 minutes: 0
@@ -141,7 +141,7 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
   // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
   if ([self endDate])
     {
-      if ([self isAllDay] && !tz)
+      if ([self isAllDay] && !tz && [[context objectForKey: @"ASProtocolVersion"] floatValue] < 16.0)
         [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
            [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
                                         hours: 0 minutes: 0
diff --git a/NEWS b/NEWS
index 0a59bf84b8..f8ca90e97b 100644
--- a/NEWS
+++ b/NEWS
@@ -56,6 +56,7 @@ Bug fixes
  - [eas] hebrew folders encoding problem using EAS (#4240)
  - [eas] avoid sync requests for shared folders every second (#4275)
  - [eas] we skip the organizer from the attendees list (#4402)
+ - [eas] correctly handle all-day events with EAS v16 (#4397)
 
 3.2.10 (2017-07-05)
 -------------------