diff --git a/meson.build b/meson.build
index 3209a1f..e7cf00d 100644
--- a/meson.build
+++ b/meson.build
@@ -16,6 +16,7 @@
 conf_data.set_quoted('DBUS_OBJECT_NAME', '/xyz/openbmc_project/State/Boot/PostCode0')
 conf_data.set_quoted('DBUS_INTF_NAME','xyz.openbmc_project.State.Boot.PostCode')
 conf_data.set('MAX_BOOT_CYCLE_COUNT',get_option('max-boot-cycle-count'))
+conf_data.set('MAX_POST_CODE_SIZE_PER_CYCLE',get_option('max-post-code-size-per-cycle'))
 
 if get_option('bios-post-code-log').enabled()
   add_project_arguments('-DENABLE_BIOS_POST_CODE_LOG',language: 'cpp')
diff --git a/meson_options.txt b/meson_options.txt
index c3d63fd..d877b97 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,3 @@
 option('max-boot-cycle-count', type:'integer', min:1, max: 100, description: 'Maximum boot cycles for which the post codes should be persisted', value:100)
 option('bios-post-code-log', type:'feature',description:'bios post code log',value:'disabled')
+option('max-post-code-size-per-cycle', type:'integer', min:64, max: 1024, description: 'Maximum post code file size per cycle', value:512)
diff --git a/src/post_code.cpp b/src/post_code.cpp
index b1ffab8..82dba46 100644
--- a/src/post_code.cpp
+++ b/src/post_code.cpp
@@ -93,6 +93,10 @@
     }
 
     postCodes.insert(std::make_pair(tsUS, code));
+    if (postCodes.size() > MAX_POST_CODE_SIZE_PER_CYCLE)
+    {
+        postCodes.erase(postCodes.begin());
+    }
     serialize(fs::path(strPostCodeListPath));
 
 #ifdef ENABLE_BIOS_POST_CODE_LOG