diff --git a/src/main/config/config.h b/src/main/config/config.h
index 6ef3a1cdad..2fad603c1c 100644
--- a/src/main/config/config.h
+++ b/src/main/config/config.h
@@ -42,7 +42,8 @@ typedef enum {
     FEATURE_DISPLAY = 1 << 17,
     FEATURE_ONESHOT125 = 1 << 18,
     FEATURE_BLACKBOX = 1 << 19,
-    FEATURE_CHANNEL_FORWARDING = 1 << 20
+    FEATURE_CHANNEL_FORWARDING = 1 << 20,
+    FEATURE_TRANSPONDER = 1 << 21,
 } features_e;
 
 void handleOneshotFeatureChangeOnRestart(void);
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index b353f79a4f..eac86da4fd 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -123,7 +123,11 @@ void setGyroSamplingSpeed(uint16_t looptime) {
                 masterConfig.mag_hardware = 1;
                 masterConfig.pid_process_denom = 2;
             } else if (looptime < 375) {
+#if defined(LUX_RACE) || defined(COLIBRI_RACE) || defined(MOTOLAB) || defined(ALIENFLIGHTF3)
                 masterConfig.acc_hardware = 0;
+#else
+                masterConfig.acc_hardware = 1;
+#endif
                 masterConfig.baro_hardware = 1;
                 masterConfig.mag_hardware = 1;
                 masterConfig.pid_process_denom = 2;
diff --git a/src/main/main.c b/src/main/main.c
index 68eb7d0715..764b1f43ad 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -147,6 +147,7 @@ typedef enum {
     SYSTEM_STATE_CONFIG_LOADED  = (1 << 0),
     SYSTEM_STATE_SENSORS_READY  = (1 << 1),
     SYSTEM_STATE_MOTORS_READY   = (1 << 2),
+    SYSTEM_STATE_TRANSPONDER_ENABLED = (1 << 3),
     SYSTEM_STATE_READY          = (1 << 7)
 } systemState_e;
 
diff --git a/src/main/mw.c b/src/main/mw.c
index 4814f430b6..29bcf7425f 100644
--- a/src/main/mw.c
+++ b/src/main/mw.c
@@ -941,3 +941,12 @@ void taskLedStrip(void)
     }
 }
 #endif
+
+#ifdef TRANSPONDER
+void taskTransponder(void)
+{
+    if (feature(FEATURE_TRANSPONDER)) {
+        updateTransponder();
+    }
+}
+#endif
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index 9ac0c57810..817f39d2a7 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -191,6 +191,7 @@
 #define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2
 #define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH2_HANDLER
 
+
 #define TRANSPONDER
 #define TRANSPONDER_GPIO                     GPIOA
 #define TRANSPONDER_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA