diff --git a/example/core/GenericFactory.cpp b/example/core/GenericFactory.cpp
index 4c70e90..e6e7efa 100644
--- a/example/core/GenericFactory.cpp
+++ b/example/core/GenericFactory.cpp
@@ -91,12 +91,6 @@ void ObjectFactory::produceGenericObjects(TmFunnel **tmFunnel, CcsdsDistributor
                                 pus::PUS_SERVICE_200);
 #endif /* OBSW_ADD_PUS_STACK == 1 */
 
-#if OBSW_ADD_CFDP_COMPONENTS == 1
-  MessageQueueIF *cfdpMsgQueue = QueueFactory::instance()->createMessageQueue(5);
-  CfdpDistribCfg cfg(objects::CFDP_DISTRIBUTOR, tcStore, cfdpMsgQueue);
-  new CfdpDistributor(cfg);
-#endif
-
 #if OBSW_ADD_TASK_EXAMPLE == 1
   /* Demo objects */
   new FsfwExampleTask(objects::TEST_DUMMY_1);
@@ -157,6 +151,10 @@ void ObjectFactory::produceGenericObjects(TmFunnel **tmFunnel, CcsdsDistributor
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1
   using namespace cfdp;
+  MessageQueueIF *cfdpMsgQueue = QueueFactory::instance()->createMessageQueue(32);
+  CfdpDistribCfg cfg(objects::CFDP_DISTRIBUTOR, tcStore, cfdpMsgQueue);
+  new CfdpDistributor(cfg);
+
   auto *msgQueue = QueueFactory::instance()->createMessageQueue(32);
   UnsignedByteField<uint16_t> remoteEntityId(common::COMMON_CFDP_CLIENT_ENTITY_ID);
   cfdp::EntityId remoteId(remoteEntityId);