diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index bbf000f326..72cfb6a43a 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -21,8 +21,6 @@
 
 #define USBD_PRODUCT_STRING "AnyFCF7"
 
-#define USE_ESC_SENSOR
-
 #define LED0   PB7
 #define LED1   PB6
 
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index a807a6f538..027eb69797 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -144,8 +144,6 @@
 #define VBAT_ADC_PIN            PC3
 #define CURRENT_METER_ADC_PIN   PC2
 
-#define USE_ESC_SENSOR
-
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index f0e39218fa..fe691c1a71 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -183,8 +183,6 @@
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-#define USE_ESC_SENSOR
-
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         0xffff
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index 458aad7d42..26577662d8 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -21,8 +21,6 @@
 
 #define USBD_PRODUCT_STRING "FuryF7"
 
-#define USE_ESC_SENSOR
-
 #define LED0                    PB5
 #define LED1                    PB4
 
diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h
index 67234d1913..a5ae8e5336 100644
--- a/src/main/target/NERO/target.h
+++ b/src/main/target/NERO/target.h
@@ -120,7 +120,6 @@
 #define USE_ADC
 #define VBAT_ADC_PIN            PC3
 
-//#define USE_ESC_SENSOR
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index b0e88fafc9..5895cb8e2b 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -191,7 +191,7 @@
 #else
 //#define RSSI_ADC_PIN            PA0
 #endif
-#define USE_ESC_SENSOR
+
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #if defined(CL_RACINGF4)
 #define DEFAULT_FEATURES        (FEATURE_TELEMETRY | FEATURE_OSD )
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 665cc54ffa..979ca7fc01 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -48,8 +48,6 @@
 
 #endif
 
-#define USE_ESC_SENSOR
-
 #define LED0                    PB5
 #if defined(PODIUMF4)
 #define LED1                    PB4
diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h
index 0d2054ea0f..112471a92b 100644
--- a/src/main/target/common_fc_pre.h
+++ b/src/main/target/common_fc_pre.h
@@ -45,12 +45,14 @@
 
 #ifdef STM32F4
 #define USE_DSHOT
+#define USE_ESC_SENSOR
 #define I2C3_OVERCLOCK true
 #define TELEMETRY_IBUS
 #endif
 
 #ifdef STM32F7
 #define USE_DSHOT
+#define USE_ESC_SENSOR
 #define I2C3_OVERCLOCK true
 #define I2C4_OVERCLOCK true
 #define TELEMETRY_IBUS