diff --git a/ROMFS/px4fmu_common/init.d/rc.fw_apps b/ROMFS/px4fmu_common/init.d/rc.fw_apps
index c565aebf46..740126bc77 100644
--- a/ROMFS/px4fmu_common/init.d/rc.fw_apps
+++ b/ROMFS/px4fmu_common/init.d/rc.fw_apps
@@ -15,7 +15,7 @@ ekf2 start
 #
 fw_att_control start
 fw_pos_control_l1 start
-airspeed_selector start
+# airspeed_selector start
 #
 # Start Land Detector.
 #
diff --git a/ROMFS/px4fmu_common/init.d/rc.vtol_apps b/ROMFS/px4fmu_common/init.d/rc.vtol_apps
index 0861bdca56..fe3e21c6f2 100644
--- a/ROMFS/px4fmu_common/init.d/rc.vtol_apps
+++ b/ROMFS/px4fmu_common/init.d/rc.vtol_apps
@@ -21,7 +21,7 @@ mc_att_control start
 mc_pos_control start
 fw_att_control start
 fw_pos_control_l1 start
-airspeed_selector start
+# airspeed_selector start
 
 #
 # Start Land Detector
diff --git a/posix-configs/SITL/init/test/test_shutdown b/posix-configs/SITL/init/test/test_shutdown
index 6c742afd07..e41acbac66 100644
--- a/posix-configs/SITL/init/test/test_shutdown
+++ b/posix-configs/SITL/init/test/test_shutdown
@@ -29,7 +29,7 @@ mc_pos_control start
 mc_att_control start
 fw_pos_control_l1 start
 fw_att_control start
-airspeed_selector start
+# airspeed_selector start
 
 #mixer load /dev/pwm_output0 ROMFS/sitl/mixers/standard_vtol_sitl.main.mix
 
@@ -56,7 +56,7 @@ mc_pos_control status
 mc_att_control status
 fw_pos_control_l1 status
 fw_att_control status
-airspeed_selector status
+# airspeed_selector status
 dataman status
 uorb status
 
@@ -72,7 +72,7 @@ navigator stop
 commander stop
 land_detector stop
 ekf2 stop
-airspeed_selector stop
+# airspeed_selector stop
 sensors stop
 
 sleep 2