diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c
index 4eb29082a90c..15363161d496 100644
--- a/src/modules/commander/commander_params.c
+++ b/src/modules/commander/commander_params.c
@@ -292,13 +292,16 @@ PARAM_DEFINE_FLOAT(COM_DISARM_LAND, 2.0f);
  * A non-zero, positive value specifies the time after arming, in seconds, within which the
  * vehicle must take off (after which it will automatically disarm).
  *
+ * This is set to 25 seconds to ensure a system will not disarm if the pilot is not immediately
+ * taking off, but not so long that a system is completely forgotten about.
+ *
  * A zero or negative value means that automatic disarming triggered by a pre-takeoff timeout is disabled.
  *
  * @group Commander
  * @unit s
  * @decimal 2
  */
-PARAM_DEFINE_FLOAT(COM_DISARM_PRFLT, 10.0f);
+PARAM_DEFINE_FLOAT(COM_DISARM_PRFLT, 25.0f);
 
 
 /**