diff --git a/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil b/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil
index a2931b0d14b4..707a3a9349fb 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil
+++ b/ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil
@@ -13,9 +13,4 @@ sh /etc/init.d/rc.mc_defaults
 set MIXER quad_x
 set PWM_OUT 1234
 
-if [ $AUTOCNF = yes ]
-then
-	param set COM_DISARM_LAND 5
-fi
-
 param set SYS_HITL 1
diff --git a/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil
index 91b8fecd65a0..62b674af2405 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil
+++ b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil
@@ -14,7 +14,6 @@ if [ $AUTOCNF = yes ]
 then
 	param set BAT_N_CELLS 3
 
-	param set COM_DISARM_LAND 5
 	param set COM_RC_IN_MODE 1
 
 	param set EKF2_AID_MASK 1
diff --git a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad
index 75a348e72e56..45b74b06b485 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad
+++ b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad
@@ -25,8 +25,6 @@ then
 	param set BAT_N_CELLS 4
 	param set BAT_R_INTERNAL 0.0025
 
-	param set COM_DISARM_LAND 5
-
 	param set CBRK_AIRSPD_CHK 162128
 	param set CBRK_IO_SAFETY 22027
 
diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark
index b19d21f25459..66110990cecd 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark
+++ b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark
@@ -25,8 +25,6 @@ then
 
 	param set BAT_N_CELLS 6
 
-	param set COM_DISARM_LAND 3
-
 	param set FW_AIRSPD_MAX   30
 	param set FW_AIRSPD_MIN   19
 	param set FW_AIRSPD_TRIM  23
diff --git a/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo
index da7258d85c4a..1590b71abc71 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo
+++ b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo
@@ -32,7 +32,6 @@ then
 
 	# takeoff, land and RTL settings
 	param set MIS_TAKEOFF_ALT   4
-	param set COM_DISARM_LAND   1
 	param set RTL_LAND_DELAY    1
 	param set RTL_DESCEND_ALT   5
 	param set RTL_RETURN_ALT    15
diff --git a/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc b/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc
index b5c70f7f4a64..341dd809f5fd 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc
+++ b/ROMFS/px4fmu_common/init.d/airframes/4070_aerofc
@@ -22,9 +22,6 @@ sh /etc/init.d/rc.mc_defaults
 if [ $AUTOCNF = yes ]
 then
 	# Set all params here, then disable autoconfig
-
-	param set COM_DISARM_LAND 3
-
 	param set EKF2_GPS_POS_X -0.0600
 	param set EKF2_GPS_POS_Z -0.1000
 	param set EKF2_MIN_OBS_DT 50
diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c
index 0bb1a5bf2a15..914d57242128 100644
--- a/src/modules/commander/commander_params.c
+++ b/src/modules/commander/commander_params.c
@@ -273,7 +273,7 @@ PARAM_DEFINE_INT32(COM_RC_ARM_HYST, 1000);
  * @unit s
  * @decimal 2
  */
-PARAM_DEFINE_FLOAT(COM_DISARM_LAND, -1.0f);
+PARAM_DEFINE_FLOAT(COM_DISARM_LAND, 2.0f);
 
 /**
  * Allow arming without GPS