diff --git a/src/fsfw/osal/host/TaskFactory.cpp b/src/fsfw/osal/host/TaskFactory.cpp
index 0a27241b..d9552923 100644
--- a/src/fsfw/osal/host/TaskFactory.cpp
+++ b/src/fsfw/osal/host/TaskFactory.cpp
@@ -20,16 +20,18 @@ TaskFactory::~TaskFactory() = default;
 
 TaskFactory* TaskFactory::instance() { return TaskFactory::factoryInstance; }
 
-PeriodicTaskIF* TaskFactory::createPeriodicTask(
-    TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_,
-    TaskPeriod periodInSeconds_, TaskDeadlineMissedFunction deadLineMissedFunction_) {
+PeriodicTaskIF* TaskFactory::createPeriodicTask(TaskName name_, TaskPriority taskPriority_,
+                                                TaskStackSize stackSize_,
+                                                TaskPeriod periodInSeconds_,
+                                                TaskDeadlineMissedFunction deadLineMissedFunction_,
+                                                void* args) {
   return new PeriodicTask(name_, taskPriority_, stackSize_, periodInSeconds_,
                           deadLineMissedFunction_);
 }
 
 FixedTimeslotTaskIF* TaskFactory::createFixedTimeslotTask(
     TaskName name_, TaskPriority taskPriority_, TaskStackSize stackSize_,
-    TaskPeriod periodInSeconds_, TaskDeadlineMissedFunction deadLineMissedFunction_) {
+    TaskPeriod periodInSeconds_, TaskDeadlineMissedFunction deadLineMissedFunction_, void* args) {
   return new FixedTimeslotTask(name_, taskPriority_, stackSize_, periodInSeconds_,
                                deadLineMissedFunction_);
 }
diff --git a/src/fsfw/tasks/TaskFactory.h b/src/fsfw/tasks/TaskFactory.h
index 9198f100..e9b96a77 100644
--- a/src/fsfw/tasks/TaskFactory.h
+++ b/src/fsfw/tasks/TaskFactory.h
@@ -48,7 +48,7 @@ class TaskFactory {
   PeriodicTaskIF* createPeriodicTask(TaskName name_, TaskPriority taskPriority_,
                                      TaskStackSize stackSize_, TaskPeriod periodInSeconds_,
                                      TaskDeadlineMissedFunction deadLineMissedFunction_,
-                                     void* args);
+                                     void* args = nullptr);
 
   /**
    * The meaning for the variables for fixed timeslot tasks is the same as for periodic tasks.
@@ -64,7 +64,7 @@ class TaskFactory {
                                                TaskStackSize stackSize_,
                                                TaskPeriod periodInSeconds_,
                                                TaskDeadlineMissedFunction deadLineMissedFunction_,
-                                               void* args);
+                                               void* args = nullptr);
 
   /**
    * Function to be called to delete a task