diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 022baa69d..f07704994 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1211,7 +1211,6 @@ void registerOpenTxFirmwares()
   /* 9XR-Pro */
   firmware = new OpenTxFirmware("opentx-9xrpro", QCoreApplication::translate("Firmware", "Turnigy 9XR-PRO"), BOARD_9XRPRO);
   firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable HELI menu and cyclic mix support"));
-  firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
   firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
   firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
   firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
@@ -1359,7 +1358,6 @@ void registerOpenTxFirmwares()
   /* ar9x board */
   firmware = new OpenTxFirmware("opentx-ar9x", QCoreApplication::translate("Firmware", "9X with AR9X board"), BOARD_AR9X);
   firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable HELI menu and cyclic mix support"));
-  firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
   firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
   firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
   firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
@@ -1379,7 +1377,6 @@ void registerOpenTxFirmwares()
   /* Sky9x board */
   firmware = new OpenTxFirmware("opentx-sky9x", QCoreApplication::translate("Firmware", "9X with Sky9x board"), BOARD_SKY9X);
   firmware->addOption("heli", QCoreApplication::translate("Firmware", "Enable HELI menu and cyclic mix support"));
-  firmware->addOption("nofp", QCoreApplication::translate("Firmware", "No flight modes"));
   firmware->addOption("gvars", QCoreApplication::translate("Firmware", "Global variables"), GVARS_VARIANT);
   firmware->addOption("potscroll", QCoreApplication::translate("Firmware", "Pots use in menus navigation"));
   firmware->addOption("autosource", QCoreApplication::translate("Firmware", "In model setup menus automatically set source by moving the control"));
diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py
index ffd92f3f3..f9cce8192 100755
--- a/radio/util/fwoptions.py
+++ b/radio/util/fwoptions.py
@@ -125,8 +125,8 @@ options_9x128.update(tts_avr)
 options_gruvin9x = {
     "heli": ("HELI", "YES", "NO"),
     "templates": ("TEMPLATES", "YES", "NO"),
-    "nofp": ("FLIGHT_MODES", "NO", "YES"),
     "nocurves": ("CURVES", "NO", "YES"),
+    "nofp": ("FLIGHT_MODES", "NO", "YES"),
     "sdcard": ("SDCARD", "YES", "NO"),
     "voice": ("VOICE", "YES", "NO"),
     "PXX": ("PXX", "YES", "NO"),
@@ -190,7 +190,6 @@ options_mega2560.update(tts_avr)
 
 options_sky9x = {
     "heli": ("HELI", "YES", "NO"),
-    "nofp": ("FLIGHT_MODES", "NO", "YES"),
     "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
     "gvars": ("GVARS", "YES", "NO"),
     "potscroll": ("NAVIGATION", "POTS", "NO"),
@@ -211,7 +210,6 @@ options_sky9x = {
 
 options_ar9x = {
     "heli": ("HELI", "YES", "NO"),
-    "nofp": ("FLIGHT_MODES", "NO", "YES"),
     "ppmus": ("PPM_UNIT", "US", "PERCENT_PREC1"),
     "gvars": ("GVARS", "YES", "NO"),
     "potscroll": ("NAVIGATION", "POTS", "NO"),