diff --git a/src/main/config/config.h b/src/main/config/config.h
index 749a70ea05..cf5357df46 100644
--- a/src/main/config/config.h
+++ b/src/main/config/config.h
@@ -44,8 +44,9 @@ typedef enum {
     FEATURE_ONESHOT125 = 1 << 18,
     FEATURE_BLACKBOX = 1 << 19,
     FEATURE_CHANNEL_FORWARDING = 1 << 20,
-    FEATURE_RX_NRF24 = 1 << 21,
-    FEATURE_SOFTSPI = 1 << 22,
+    FEATURE_TRANSPONDER = 1 << 21,
+    FEATURE_RX_NRF24 = 1 << 22,
+    FEATURE_SOFTSPI = 1 << 23,
 } features_e;
 
 void handleOneshotFeatureChangeOnRestart(void);
diff --git a/src/main/drivers/rx_xn297.c b/src/main/drivers/rx_xn297.c
index be50b09b59..8a2b2bf1dc 100644
--- a/src/main/drivers/rx_xn297.c
+++ b/src/main/drivers/rx_xn297.c
@@ -49,13 +49,6 @@ static uint8_t bitReverse(uint8_t bIn)
     return bOut;
 }
 
-/*void XN297_UnscramblePayload(uint8_t* data, int len)
-{
-    for (uint8_t ii = 0; ii < len; ++ii) {
-        data[ii] = bitReverse(data[ii] ^ xn297_data_scramble[ii]);
-    }
-}
-*/
 
 #define RX_TX_ADDR_LEN 5
 
diff --git a/src/main/io/msp_protocol.h b/src/main/io/msp_protocol.h
index 02054d1bf3..40f9957546 100644
--- a/src/main/io/msp_protocol.h
+++ b/src/main/io/msp_protocol.h
@@ -60,7 +60,7 @@
 #define MSP_PROTOCOL_VERSION                0
 
 #define API_VERSION_MAJOR                   1 // increment when major changes are made
-#define API_VERSION_MINOR                   20 // increment when any change is made, reset to zero when major changes are released after changing API_VERSION_MAJOR
+#define API_VERSION_MINOR                   21 // increment when any change is made, reset to zero when major changes are released after changing API_VERSION_MAJOR
 
 #define API_VERSION_LENGTH                  2
 
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index 7289fb8cfa..1ae6c69660 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -973,7 +973,7 @@ static bool processOutCommand(uint8_t cmdMSP)
         break;
 
     case MSP_RX_CONFIG:
-        headSerialReply(13);
+        headSerialReply(17);
         serialize8(masterConfig.rxConfig.serialrx_provider);
         serialize16(masterConfig.rxConfig.maxcheck);
         serialize16(masterConfig.rxConfig.midrc);
@@ -982,6 +982,7 @@ static bool processOutCommand(uint8_t cmdMSP)
         serialize16(masterConfig.rxConfig.rx_min_usec);
         serialize16(masterConfig.rxConfig.rx_max_usec);
         serialize8(masterConfig.rxConfig.nrf24rx_protocol);
+        serialize32(masterConfig.rxConfig.nrf24rx_id);
         break;
 
     case MSP_FAILSAFE_CONFIG:
@@ -1483,6 +1484,9 @@ static bool processInCommand(void)
         if (currentPort->dataSize > 12) {
             masterConfig.rxConfig.nrf24rx_protocol = read8();
         }
+        if (currentPort->dataSize > 13) {
+            masterConfig.rxConfig.nrf24rx_id = read32();
+        }
         break;
 
     case MSP_SET_FAILSAFE_CONFIG: