diff --git a/radio/src/telemetry/crossfire.cpp b/radio/src/telemetry/crossfire.cpp
index b0ef34e7c..cd5823fd2 100644
--- a/radio/src/telemetry/crossfire.cpp
+++ b/radio/src/telemetry/crossfire.cpp
@@ -20,41 +20,6 @@
 
 #include "opentx.h"
 
-struct CrossfireSensor {
-  const uint8_t id;
-  const uint8_t subId;
-  const char * name;
-  const TelemetryUnit unit;
-  const uint8_t precision;
-};
-
-enum CrossfireSensorIndexes {
-  RX_RSSI1_INDEX,
-  RX_RSSI2_INDEX,
-  RX_QUALITY_INDEX,
-  RX_SNR_INDEX,
-  RX_ANTENNA_INDEX,
-  RF_MODE_INDEX,
-  TX_POWER_INDEX,
-  TX_RSSI_INDEX,
-  TX_QUALITY_INDEX,
-  TX_SNR_INDEX,
-  BATT_VOLTAGE_INDEX,
-  BATT_CURRENT_INDEX,
-  BATT_CAPACITY_INDEX,
-  GPS_LATITUDE_INDEX,
-  GPS_LONGITUDE_INDEX,
-  GPS_GROUND_SPEED_INDEX,
-  GPS_HEADING_INDEX,
-  GPS_ALTITUDE_INDEX,
-  GPS_SATELLITES_INDEX,
-  ATTITUDE_PITCH_INDEX,
-  ATTITUDE_ROLL_INDEX,
-  ATTITUDE_YAW_INDEX,
-  FLIGHT_MODE_INDEX,
-  UNKNOWN_INDEX,
-};
-
 const CrossfireSensor crossfireSensors[] = {
   {LINK_ID,        0, ZSTR_RX_RSSI1,    UNIT_DB,            0},
   {LINK_ID,        1, ZSTR_RX_RSSI2,    UNIT_DB,            0},
diff --git a/radio/src/telemetry/crossfire.h b/radio/src/telemetry/crossfire.h
index b189ea202..321da7599 100644
--- a/radio/src/telemetry/crossfire.h
+++ b/radio/src/telemetry/crossfire.h
@@ -37,6 +37,42 @@
 #define DEVICE_INFO_ID                 0x29
 #define REQUEST_SETTINGS_ID            0x2A
 
+
+struct CrossfireSensor {
+  const uint8_t id;
+  const uint8_t subId;
+  const char * name;
+  const TelemetryUnit unit;
+  const uint8_t precision;
+};
+
+enum CrossfireSensorIndexes {
+  RX_RSSI1_INDEX,
+  RX_RSSI2_INDEX,
+  RX_QUALITY_INDEX,
+  RX_SNR_INDEX,
+  RX_ANTENNA_INDEX,
+  RF_MODE_INDEX,
+  TX_POWER_INDEX,
+  TX_RSSI_INDEX,
+  TX_QUALITY_INDEX,
+  TX_SNR_INDEX,
+  BATT_VOLTAGE_INDEX,
+  BATT_CURRENT_INDEX,
+  BATT_CAPACITY_INDEX,
+  GPS_LATITUDE_INDEX,
+  GPS_LONGITUDE_INDEX,
+  GPS_GROUND_SPEED_INDEX,
+  GPS_HEADING_INDEX,
+  GPS_ALTITUDE_INDEX,
+  GPS_SATELLITES_INDEX,
+  ATTITUDE_PITCH_INDEX,
+  ATTITUDE_ROLL_INDEX,
+  ATTITUDE_YAW_INDEX,
+  FLIGHT_MODE_INDEX,
+  UNKNOWN_INDEX,
+};
+
 void processCrossfireTelemetryData(uint8_t data);
 void crossfireSetDefault(int index, uint8_t id, uint8_t subId);
 bool isCrossfireOutputBufferAvailable();
diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp
index 26c6cf7cb..35a1d7e9a 100644
--- a/radio/src/telemetry/telemetry_sensors.cpp
+++ b/radio/src/telemetry/telemetry_sensors.cpp
@@ -47,6 +47,7 @@ bool isFaiForbidden(source_t idx)
       }
       break;
 
+#if defined(CROSSFIRE)
     case TELEM_PROTO_CROSSFIRE:
       if (sensor->id == RX_RSSI1_INDEX) {
         return false;
@@ -58,7 +59,7 @@ bool isFaiForbidden(source_t idx)
         return false;
       }
       break;
-
+#endif
   }
   return true;
 }