diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index ceed5e3b1..6c2467079 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -1060,8 +1060,8 @@ void menuModelSetup(uint8_t event)
           else if (m_posHorz==1) {
             s_editMode = 0;
             if (g_model.failsafeMode==FAILSAFE_CUSTOM && event==EVT_KEY_LONG(KEY_ENTER)) {
-              for (int32_t i=g_model.ppmSCH; i<g_model.ppmSCH+NUM_PORT1_CHANNELS(g_model); i++) {
-                g_model.failsafeChannels[i] = channelOutputs[i];
+              for (int32_t i=0; i<16; i++) {
+                g_model.failsafeChannels[i] = (i < NUM_PORT1_CHANNELS(g_model) ? channelOutputs[g_model.ppmSCH + i] : 0);
               }
             }
           }
diff --git a/src/x9d/pulses_driver.cpp b/src/x9d/pulses_driver.cpp
index 37c57ed81..b7ed3f01b 100644
--- a/src/x9d/pulses_driver.cpp
+++ b/src/x9d/pulses_driver.cpp
@@ -57,6 +57,8 @@ extern uint16_t pxxStream[400] ;
 
 void init_pxx()
 {
+  INTERNAL_RF_ON();
+
   // Timer1
   setupPulsesPXX() ; // TODO not here!
 
@@ -113,6 +115,7 @@ void disable_pxx()
   NVIC_DisableIRQ(TIM1_CC_IRQn) ;
   TIM1->DIER &= ~TIM_DIER_CC2IE ;
   TIM1->CR1 &= ~TIM_CR1_CEN ;
+  INTERNAL_RF_OFF();
 }
 
 // Robert@FrSky code