diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
index 4e5074571..ca32e6289 100644
--- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
@@ -37,7 +37,7 @@
 #define AUDIO
 #define VOICE
 #define HAPTIC
-#define PXX
+// #define PXX
 #define DSM2
 #define DSM2_PPM
 #define DBLKEYS
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index e8339078f..9643857b3 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -741,9 +741,9 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
       case 0:
         switch (proto) {
           case PPM:
-          case PXX_XJT_X16:
-          case PXX_XJT_D8:
-          case PXX_XJT_LR12:
+          // case PXX_XJT_X16:
+          // case PXX_XJT_D8:
+          // case PXX_XJT_LR12:
           case LP45:
           case DSM2:
           case DSMX:
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 8602d57db..70aff9bf7 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -1390,7 +1390,7 @@ void menuModelSetup(uint8_t event)
       case ITEM_MODEL_EXTERNAL_MODULE_MODE:
         lcd_putsLeft(y, STR_MODE);
         lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.externalModule, m_posHorz==0 ? attr : 0);
-        if (g_model.externalModule == MODULE_TYPE_XJT)
+        if (IS_MODULE_XJT(EXTERNAL_MODULE))
           lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0);
         else if (IS_MODULE_DSM2(EXTERNAL_MODULE))
           lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_DSM_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0);
@@ -1399,6 +1399,7 @@ void menuModelSetup(uint8_t event)
             case 0:
               g_model.externalModule = checkIncDec(event, g_model.externalModule, MODULE_TYPE_NONE, MODULE_TYPE_COUNT-1, EE_MODEL, isModuleAvailable);
               if (checkIncDec_Ret) {
+                g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
                 g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
                 if (g_model.externalModule == MODULE_TYPE_PPM)
                   g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0;
diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index da4003b0a..7125aeec8 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -1576,10 +1576,16 @@ bool isAssignableFunctionAvailable(int function)
 
 bool isModuleAvailable(int module)
 {
+#if defined(PCBSKY9X)
+  if (module == MODULE_TYPE_NONE)
+    return false;
+#endif
+
 #if !defined(PXX)
   if (module == MODULE_TYPE_XJT)
     return false;
 #endif
+
   return true;
 }