diff --git a/databus-core/databus-core-impl/src/main/java/com/linkedin/databus/core/DbusEventBuffer.java b/databus-core/databus-core-impl/src/main/java/com/linkedin/databus/core/DbusEventBuffer.java
index 70a61e94..b3195258 100644
--- a/databus-core/databus-core-impl/src/main/java/com/linkedin/databus/core/DbusEventBuffer.java
+++ b/databus-core/databus-core-impl/src/main/java/com/linkedin/databus/core/DbusEventBuffer.java
@@ -2508,6 +2508,10 @@ public StreamEventsResult streamEvents(Checkpoint checkPoint,
         {
           if (skippedMessages < messagesToSkip)
           {
+            if (e.isEndOfPeriodMarker() || e.isCheckpointMessage())
+            {
+              continue;
+            }
             ++skippedMessages;
             continue;
           }