diff --git a/src/event_manager.cpp b/src/event_manager.cpp
index 9102137..2c09f35 100644
--- a/src/event_manager.cpp
+++ b/src/event_manager.cpp
@@ -62,6 +62,13 @@
     auto objPath =  std::string(OBJ_EVENT) + '/' + eventName + '/' +
                         std::to_string(id);
 
+    // check for capping of the events,if cap reached then erase the oldest
+    // event.
+    if (eventQueue.size() == MAX_EVENTS)
+    {
+        eventQueue.pop();
+    }
+
     eventQueue.emplace(std::make_unique<Entry>(
                        objPath,
                        ms, // Milliseconds since 1970