diff --git a/openrtx/src/core/threads.c b/openrtx/src/core/threads.c
index 524a3e3d..1cb7f35c 100644
--- a/openrtx/src/core/threads.c
+++ b/openrtx/src/core/threads.c
@@ -97,7 +97,8 @@ void *ui_threadFunc(void *arg)
             rtx_cfg.txToneEn    = state.channel.fm.txToneEn;
             rtx_cfg.txTone      = ctcss_tone[state.channel.fm.txTone];
 
-            // Copy new M17 source and destination addresses
+            // Copy new M17 CAN, source and destination addresses
+            rtx_cfg.can = state.m17_data.can;
             strncpy(rtx_cfg.source_address,      state.settings.callsign, 10);
             strncpy(rtx_cfg.destination_address, state.m17_data.dst_addr, 10);
 
diff --git a/openrtx/src/rtx/OpMode_M17.cpp b/openrtx/src/rtx/OpMode_M17.cpp
index f9c00811..9c5b04a7 100644
--- a/openrtx/src/rtx/OpMode_M17.cpp
+++ b/openrtx/src/rtx/OpMode_M17.cpp
@@ -223,9 +223,9 @@ void OpMode_M17::txState(rtxStatus_t *const status)
         if(!dst.empty()) lsf.setDestination(dst);
 
         streamType_t type;
-        type.fields.stream   = 1;   // Stream
-        type.fields.dataType = 2;   // Voice data
-        type.fields.CAN      = 0;   // Channel access number
+        type.fields.stream   = 1;             // Stream
+        type.fields.dataType = 2;             // Voice data
+        type.fields.CAN      = status->can;   // Channel access number
 
         lsf.setType(type);
         lsf.updateCrc();