diff --git a/src/modules/mc_att_control/mc_att_control_main.cpp b/src/modules/mc_att_control/mc_att_control_main.cpp
index 0243dc2f7c..401cf05f17 100644
--- a/src/modules/mc_att_control/mc_att_control_main.cpp
+++ b/src/modules/mc_att_control/mc_att_control_main.cpp
@@ -835,7 +835,7 @@ MulticopterAttitudeControl::start()
 	_control_task = task_spawn_cmd("mc_att_control",
 				       SCHED_DEFAULT,
 				       SCHED_PRIORITY_MAX - 5,
-				       1800,
+				       1600,
 				       (main_t)&MulticopterAttitudeControl::task_main_trampoline,
 				       nullptr);
 
diff --git a/src/modules/mc_att_control/module.mk b/src/modules/mc_att_control/module.mk
index 64b876f69b..f32bc71bf2 100644
--- a/src/modules/mc_att_control/module.mk
+++ b/src/modules/mc_att_control/module.mk
@@ -39,3 +39,7 @@ MODULE_COMMAND	= mc_att_control
 
 SRCS		= mc_att_control_main.cpp \
 			  mc_att_control_params.c
+
+# Startup handler, the actual app stack size is
+# in the task_spawn command
+MODULE_STACKSIZE = 1200