diff --git a/src/main/config/config.c b/src/main/config/config.c
index 289f2e571..7116f96ac 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -410,7 +410,7 @@ static void resetConf(void)
 
     for (i = 0; i < MAX_SUPPORTED_RC_CHANNEL_COUNT; i++) {
         rxFailsafeChannelConfiguration_t *channelFailsafeConfiguration = &masterConfig.rxConfig.failsafe_channel_configurations[i];
-        channelFailsafeConfiguration->mode = (i < NON_AUX_CHANNEL_COUNT) ? RX_FAILSAFE_MODE_AUTO : RX_FAILSAFE_MODE_HOLD;
+        channelFailsafeConfiguration->mode = RX_FAILSAFE_MODE_AUTO;
         channelFailsafeConfiguration->step = (i == THROTTLE) ? masterConfig.rxConfig.rx_min_usec : CHANNEL_VALUE_TO_RXFAIL_STEP(masterConfig.rxConfig.midrc);
     }
 
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 02166e37e..452fb6ca3 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -378,16 +378,13 @@ static uint16_t getRxfailValue(uint8_t channel)
     switch(channelFailsafeConfiguration->mode) {
         case RX_FAILSAFE_MODE_AUTO:
             switch (channel) {
-                case ROLL:
-                case PITCH:
-                case YAW:
-                    return rxConfig->midrc;
-
                 case THROTTLE:
                     if (feature(FEATURE_3D))
                         return rxConfig->midrc;
                     else
                         return rxConfig->rx_min_usec;
+                default:
+                    return rxConfig->midrc;
             }
             /* no break */