diff --git a/src/boards/RIGv2/Configs/RadioConfig.h b/src/boards/RIGv2/Configs/RadioConfig.h
index 1e73efd97e4f652a3e75ec4c4ebaad7046f9e917..a094a7a9f72f5053ca273d453b98fe4646d43274 100644
--- a/src/boards/RIGv2/Configs/RadioConfig.h
+++ b/src/boards/RIGv2/Configs/RadioConfig.h
@@ -42,8 +42,8 @@ constexpr size_t MAV_OUT_BUFFER_MAX_AGE = 10;
 constexpr unsigned int CIRCULAR_BUFFER_SIZE  = 30;
 constexpr unsigned int MAX_PACKETS_PER_FLUSH = 4;
 
-constexpr uint8_t MAV_SYSTEM_ID    = 171;
-constexpr uint8_t MAV_COMPONENT_ID = 96;
+constexpr uint8_t MAV_SYSTEM_ID    = MAV_SYSID_RIG;
+constexpr uint8_t MAV_COMPONENT_ID = 0;
 
 constexpr long long LAST_COMMAND_THRESHOLD = 300;