diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index 3d618cdb..bdbd577b 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -64,7 +64,7 @@ void ObjectFactory::produce(void* args) {
   PersistentTmStores persistentStores;
   auto sdcMan = new DummySdCardManager("/tmp");
   ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel, *sdcMan, &ipcStore,
-                                       &tmStore, persistentStores);
+                                       &tmStore, persistentStores, 120);
 
   auto* dummyGpioIF = new DummyGpioIF();
   auto* dummySwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0);
diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index 06f1220e..2dd00ee6 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -96,9 +96,10 @@ std::atomic_bool tcs::TCS_BOARD_SHORTLY_UNAVAILABLE = false;
 void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFunnel** pusFunnel,
                                           CfdpTmFunnel** cfdpFunnel, SdCardMountedIF& sdcMan,
                                           StorageManagerIF** ipcStore, StorageManagerIF** tmStore,
-                                          PersistentTmStores& stores) {
+                                          PersistentTmStores& stores,
+                                          uint32_t eventManagerQueueDepth) {
   // Framework objects
-  new EventManager(objects::EVENT_MANAGER, 160);
+  new EventManager(objects::EVENT_MANAGER, eventManagerQueueDepth);
   auto healthTable = new HealthTable(objects::HEALTH_TABLE);
   if (healthTable_ != nullptr) {
     *healthTable_ = healthTable;
diff --git a/mission/genericFactory.h b/mission/genericFactory.h
index 6cd2068d..a3a52704 100644
--- a/mission/genericFactory.h
+++ b/mission/genericFactory.h
@@ -45,7 +45,7 @@ namespace ObjectFactory {
 void produceGenericObjects(HealthTableIF** healthTable, PusTmFunnel** pusFunnel,
                            CfdpTmFunnel** cfdpFunnel, SdCardMountedIF& sdcMan,
                            StorageManagerIF** ipcStore, StorageManagerIF** tmStore,
-                           PersistentTmStores& stores);
+                           PersistentTmStores& stores, uint32_t eventManagerQueueDepth);
 void createGenericHeaterComponents(GpioIF& gpioIF, PowerSwitchIF& pwrSwitcher,
                                    HeaterHandler*& heaterHandler);