diff --git a/configure.ac b/configure.ac
index 6bc253f..f5e8b3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,5 +66,9 @@
 AC_ARG_VAR(YAML_PATH, [The path to the yaml config files.])
 AS_IF([test "x$YAML_PATH" == "x"], [YAML_PATH="\${top_srcdir}/src/example"])
 
+AC_ARG_VAR(MAX_EVENTS, [Maximum number of events.])
+AS_IF([test "x$MAX_EVENTS" == "x"], [MAX_EVENTS=20])
+AC_DEFINE_UNQUOTED([MAX_EVENTS], [$MAX_EVENTS], [Maximum number of events.])
+
 AC_CONFIG_FILES([Makefile src/Makefile src/test/Makefile mslverify/Makefile])
 AC_OUTPUT
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