diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c
index a18d91b6..faba3b08 100644
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@@ -3830,7 +3830,12 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
                         rc->triggered = false;
                     }
 
-                    rc->nextIntgReportTime = rc->nextIntgReportTime + rc->intgPd;
+                    if (rc->server->syncIntegrityReportTimes) {
+                        rc->nextIntgReportTime = getNextRoundedStartTime(currentTimeInMs, rc->intgPd);
+                    }
+                    else {
+                        rc->nextIntgReportTime = rc->nextIntgReportTime + rc->intgPd;
+                    }
 
                     /* check for system time change effects */
                     if ((rc->nextIntgReportTime < currentTimeInMs) || (rc->nextIntgReportTime > currentTimeInMs + rc->intgPd)) {