diff --git a/companion/src/firmwares/moduledata.cpp b/companion/src/firmwares/moduledata.cpp
index e09724b48..8b9b08c2f 100644
--- a/companion/src/firmwares/moduledata.cpp
+++ b/companion/src/firmwares/moduledata.cpp
@@ -57,6 +57,27 @@ bool ModuleData::isPxx1Module() const
   }
 }
 
+bool ModuleData::supportRxNum() const
+{
+  switch (protocol) {
+    case PULSES_PXX_XJT_X16:
+    case PULSES_PXX_R9M:
+    case PULSES_PXX_R9M_LITE:
+    case PULSES_PXX_R9M_LITE_PRO:
+    case PULSES_MULTIMODULE:
+    case PULSES_ACCESS_ISRM:
+    case PULSES_ACCST_ISRM_D16:
+    case PULSES_ACCESS_R9M:
+    case PULSES_ACCESS_R9M_LITE:
+    case PULSES_ACCESS_R9M_LITE_PRO:
+    case PULSES_XJT_LITE_X16:
+    case PULSES_XJT_LITE_LR12:
+    case PULSES_PXX_XJT_LR12:
+      return true;
+    default:
+      return false;
+  }
+}
 
 QString ModuleData::rfProtocolToString() const
 {
diff --git a/companion/src/firmwares/moduledata.h b/companion/src/firmwares/moduledata.h
index 4e05e2120..8f3f8cd53 100644
--- a/companion/src/firmwares/moduledata.h
+++ b/companion/src/firmwares/moduledata.h
@@ -186,6 +186,7 @@ class ModuleData {
     void convert(RadioDataConversionState & cstate);
     bool isPxx2Module() const;
     bool isPxx1Module() const;
+    bool supportRxNum() const;
     QString polarityToString() const { return ppm.pulsePol ? tr("Positive") : tr("Negative"); }
     QString rfProtocolToString() const;
     QString subTypeToString(int type = -1) const;
diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp
index 50950872c..2fb5cc329 100644
--- a/companion/src/modelslist.cpp
+++ b/companion/src/modelslist.cpp
@@ -727,7 +727,7 @@ void TreeModel::refresh()
         protocol = moduleData.protocol;
         // These are the only RXs that allow nominating RX # but changing RX or copying models can leave residual configuration which can cause issues
         // if (protocol == PULSES_PXX_XJT_X16 || protocol == PULSES_PXX_XJT_LR12 || protocol == PULSES_PXX_R9M || protocol == PULSES_DSMX || protocol == PULSES_MULTIMODULE) {
-        if ((protocol != PULSES_OFF && protocol != PULSES_PXX_XJT_D8 ) && moduleData.modelId > 0) {
+        if (moduleData.supportRxNum() && moduleData.modelId > 0) {
           if (!rxs.isEmpty()) {
             rxs.append(", ");
           }