diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp
index 5daeae477e..06df5fd974 100644
--- a/src/modules/fw_att_control/fw_att_control_main.cpp
+++ b/src/modules/fw_att_control/fw_att_control_main.cpp
@@ -1119,7 +1119,7 @@ FixedwingAttitudeControl::start()
 	_control_task = task_spawn_cmd("fw_att_control",
 				       SCHED_DEFAULT,
 				       SCHED_PRIORITY_MAX - 5,
-				       2048,
+				       1600,
 				       (main_t)&FixedwingAttitudeControl::task_main_trampoline,
 				       nullptr);
 
diff --git a/src/modules/fw_att_control/module.mk b/src/modules/fw_att_control/module.mk
index 3661a171fc..3909926990 100644
--- a/src/modules/fw_att_control/module.mk
+++ b/src/modules/fw_att_control/module.mk
@@ -40,6 +40,8 @@ MODULE_COMMAND	= fw_att_control
 SRCS		= fw_att_control_main.cpp \
 		  fw_att_control_params.c
 
+# Startup handler, the actual app stack size is
+# in the task_spawn command
 MODULE_STACKSIZE = 1200
 
 MAXOPTIMIZATION = -Os