diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig
index a904d90ac5..cb9ddee5f4 100644
--- a/nuttx/configs/px4fmu/nsh/appconfig
+++ b/nuttx/configs/px4fmu/nsh/appconfig
@@ -46,14 +46,18 @@ CONFIGURED_APPS += systemlib
 CONFIGURED_APPS += systemlib/mixer
 
 # Math library
+ifneq ($(CONFIG_APM),y)
 CONFIGURED_APPS += mathlib
 CONFIGURED_APPS += mathlib/CMSIS
 CONFIGURED_APPS += examples/math_demo
+endif
 
 # Control library
+ifneq ($(CONFIG_APM),y)
 CONFIGURED_APPS	+= controllib
 CONFIGURED_APPS += examples/control_demo
 CONFIGURED_APPS += examples/kalman_demo
+endif
 
 # System utility commands
 CONFIGURED_APPS += systemcmds/reboot