diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c
index 2969c7ffcd..a8791bc905 100644
--- a/src/main/target/COLIBRI_RACE/i2c_bst.c
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.c
@@ -1262,15 +1262,22 @@ static bool bstSlaveProcessWriteCommand(uint8_t bstWriteCommand)
             featureClearAll();
             featureSet(bstRead32()); // features bitmap
 #ifdef SERIALRX_UART
+            int serialIndex = findSerialPortIndexByIdentifier(SERIALRX_UART);
             if (featureConfigured(FEATURE_RX_SERIAL)) {
+                /*
                 for (i = 0; i < SERIAL_PORT_COUNT; i++) {
                     if(serialConfig()->portConfigs[i].functionMask == FUNCTION_RX_SERIAL
                             && i != SERIALRX_UART)
                         serialConfig()->portConfigs[i].functionMask = FUNCTION_NONE;
                 }
-                serialConfig()->portConfigs[SERIALRX_UART].functionMask = FUNCTION_RX_SERIAL;
+                */
+                if (serialIndex >= 0) {
+                    serialConfig()->portConfigs[serialIndex].functionMask = FUNCTION_RX_SERIAL;
+                }
             } else {
-                serialConfig()->portConfigs[SERIALRX_UART].functionMask = FUNCTION_NONE;
+                if (serialIndex >= 0) {
+                    serialConfig()->portConfigs[serialIndex].functionMask = FUNCTION_NONE;
+                }
             }
 #endif
             break;
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index e72ea485bf..92c3aa0026 100755
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -123,8 +123,8 @@
 
 #define DEFAULT_FEATURES        (FEATURE_VBAT | FEATURE_FAILSAFE | FEATURE_AIRMODE | FEATURE_LED_STRIP)
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
-#define SERIALRX_PROVIDER       SERIALRX_SBUS
-#define SERIALRX_UART           SERIAL_PORT_USART3
+#define SERIALRX_PROVIDER       SERIALRX_CRSF
+#define SERIALRX_UART           SERIAL_PORT_USART2
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE