diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 8ce031250..5a1b16245 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1379,7 +1379,7 @@ void menuModelSetup(event_t event)
             // for now we will send the SHARE frame indefinitely (until the user manually stops it)
             if (event == EVT_KEY_BREAK(KEY_ENTER)) {
               moduleSettings[moduleIdx].mode ^= MODULE_MODE_SHARE;
-              reusableBuffer.moduleSetup.pxx2.shareReceiverIndex = receiverIdx;
+              reusableBuffer.moduleSetup.pxx2.shareReceiverId = receiverSlot;
             }
             else if (event == EVT_KEY_BREAK(KEY_EXIT)) {
               moduleSettings[moduleIdx].mode &= ~MODULE_MODE_SHARE;
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 90f66ee62..4d4191b60 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1135,7 +1135,7 @@ union ReusableBuffer
         uint8_t bindReceiverId;
         union {
           uint8_t bindSelectedReceiverIndex;
-          uint8_t shareReceiverIndex;
+          uint8_t shareReceiverId;
         };
       } pxx2;
     };
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index a46793d8b..286497bb0 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -225,7 +225,7 @@ void Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
 void Pxx2Pulses::setupShareMode(uint8_t module)
 {
   addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_SHARE);
-  Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.shareReceiverIndex);
+  Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.shareReceiverId);
 }
 
 void Pxx2Pulses::setupFrame(uint8_t module)
diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp
index 565ff5a27..d78af961c 100644
--- a/radio/src/telemetry/frsky_pxx2.cpp
+++ b/radio/src/telemetry/frsky_pxx2.cpp
@@ -74,8 +74,8 @@ void processReceiverSettingsFrame(uint8_t module, uint8_t * frame)
   if (frame[4] & PXX2_RX_SETTINGS_FLAG1_FASTPWM)
     reusableBuffer.receiverSetup.pwmRate = 1;
 
-//  if (frame[4] & PXX2_RECV_OPTION_MASK_TELEMETRY)
-//    reusableBuffer.receiverSetup.telemetryEnabled = 1;
+  if (frame[4] & PXX2_RX_SETTINGS_FLAG1_TELEMETRY_DISABLED)
+    reusableBuffer.receiverSetup.telemetryDisabled = 1;
 
   reusableBuffer.receiverSetup.state = RECEIVER_SETTINGS_OK;
   reusableBuffer.receiverSetup.timeout = 0;