diff --git a/src/main/telemetry/crsf.c b/src/main/telemetry/crsf.c
index e0321771b0..84345bbf50 100644
--- a/src/main/telemetry/crsf.c
+++ b/src/main/telemetry/crsf.c
@@ -80,7 +80,7 @@ static void crsfInitializeFrame(sbuf_t *dst)
     dst->ptr = crsfFrame;
     dst->end = ARRAYEND(crsfFrame);
 
-    sbufWriteU8(dst, CRSF_ADDRESS_CRSF_RECEIVER);
+    sbufWriteU8(dst, CRSF_ADDRESS_BROADCAST);
 }
 
 static void crsfSerialize8(sbuf_t *dst, uint8_t v)
diff --git a/src/test/unit/telemetry_crsf_unittest.cc b/src/test/unit/telemetry_crsf_unittest.cc
index 67c7406867..028b0e75ac 100644
--- a/src/test/unit/telemetry_crsf_unittest.cc
+++ b/src/test/unit/telemetry_crsf_unittest.cc
@@ -91,7 +91,7 @@ TEST(TelemetryCrsfTest, TestGPS)
 
     int frameLen = getCrsfFrame(frame, CRSF_FRAME_GPS);
     EXPECT_EQ(CRSF_FRAME_GPS_PAYLOAD_SIZE + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(17, frame[1]); // length
     EXPECT_EQ(0x02, frame[2]); // type
     int32_t lattitude = frame[3] << 24 | frame[4] << 16 | frame[5] << 8 | frame[6];
@@ -141,7 +141,7 @@ TEST(TelemetryCrsfTest, TestBattery)
     vbat = 0; // 0.1V units
     int frameLen = getCrsfFrame(frame, CRSF_FRAME_BATTERY_SENSOR);
     EXPECT_EQ(CRSF_FRAME_BATTERY_SENSOR_PAYLOAD_SIZE + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(10, frame[1]); // length
     EXPECT_EQ(0x08, frame[2]); // type
     uint16_t voltage = frame[3] << 8 | frame[4]; // mV * 100
@@ -175,7 +175,7 @@ TEST(TelemetryCrsfTest, TestLinkStatistics)
 
     int frameLen = getCrsfFrame(frame, CRSF_FRAME_LINK_STATISTICS);
     EXPECT_EQ(CRSF_FRAME_LINK_STATISTICS_PAYLOAD_SIZE + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(12, frame[1]); // length
     EXPECT_EQ(0x14, frame[2]); // type
     EXPECT_EQ(crfsCrc(frame, frameLen), frame[13]);
@@ -190,7 +190,7 @@ TEST(TelemetryCrsfTest, TestAttitude)
     attitude.values.yaw = 0;
     int frameLen = getCrsfFrame(frame, CRSF_FRAME_ATTITUDE);
     EXPECT_EQ(CRSF_FRAME_ATTITUDE_PAYLOAD_SIZE + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(8, frame[1]); // length
     EXPECT_EQ(0x1e, frame[2]); // type
     int16_t pitch = frame[3] << 8 | frame[4]; // rad / 10000
@@ -222,7 +222,7 @@ TEST(TelemetryCrsfTest, TestFlightMode)
     airMode = false;
     int frameLen = getCrsfFrame(frame, CRSF_FRAME_FLIGHT_MODE);
     EXPECT_EQ(5 + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(7, frame[1]); // length
     EXPECT_EQ(0x21, frame[2]); // type
     EXPECT_EQ('A', frame[3]);
@@ -237,7 +237,7 @@ TEST(TelemetryCrsfTest, TestFlightMode)
     EXPECT_EQ(ANGLE_MODE, FLIGHT_MODE(ANGLE_MODE));
     frameLen = getCrsfFrame(frame, CRSF_FRAME_FLIGHT_MODE);
     EXPECT_EQ(5 + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(7, frame[1]); // length
     EXPECT_EQ(0x21, frame[2]); // type
     EXPECT_EQ('S', frame[3]);
@@ -252,7 +252,7 @@ TEST(TelemetryCrsfTest, TestFlightMode)
     EXPECT_EQ(HORIZON_MODE, FLIGHT_MODE(HORIZON_MODE));
     frameLen = getCrsfFrame(frame, CRSF_FRAME_FLIGHT_MODE);
     EXPECT_EQ(4 + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(6, frame[1]); // length
     EXPECT_EQ(0x21, frame[2]); // type
     EXPECT_EQ('H', frame[3]);
@@ -265,7 +265,7 @@ TEST(TelemetryCrsfTest, TestFlightMode)
     airMode = true;
     frameLen = getCrsfFrame(frame, CRSF_FRAME_FLIGHT_MODE);
     EXPECT_EQ(4 + FRAME_HEADER_FOOTER_LEN, frameLen);
-    EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, frame[0]); // address
+    EXPECT_EQ(CRSF_ADDRESS_BROADCAST, frame[0]); // address
     EXPECT_EQ(6, frame[1]); // length
     EXPECT_EQ(0x21, frame[2]); // type
     EXPECT_EQ('A', frame[3]);