diff --git a/fsfw b/fsfw
index d8580074..ceb87b5a 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit d8580074c2730d861353ab47e659afeb707afe71
+Subproject commit ceb87b5abb2992a18266328e0ea34d9af15db7af
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 58485b71..14c8791a 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -101,18 +101,18 @@ void ObjectFactory::produceGenericObjects() {
 #if OBSW_ADD_TCPIP_BRIDGE == 1
 #if OBSW_USE_TCP_BRIDGE == 0
     auto tmtcBridge = new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
-    tmtcBridge->setMaxNumberOfPacketsStored(50);
     new UdpTcPollingTask(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
     sif::info << "Created UDP server for TMTC commanding with listener port " <<
             udpBridge->getUdpPort() << std::endl;
 #else
     auto tmtcBridge = new TcpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
-    tmtcBridge->setMaxNumberOfPacketsStored(50);
     auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
     // TCP is stream based. Use packet ID as start marker when parsing for space packets
     tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID});
     sif::info << "Created TCP server for TMTC commanding with listener port "
             << tcpServer->getTcpPort() << std::endl;
 #endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */
+    tmtcBridge->setMaxNumberOfPacketsStored(70);
 #endif /* OBSW_ADD_TCPIP_BRIDGE == 1 */
+
 }