diff --git a/js/backup_restore.js b/js/backup_restore.js
index a0a75d87..08b5f9da 100644
--- a/js/backup_restore.js
+++ b/js/backup_restore.js
@@ -713,7 +713,6 @@ function configuration_restore(callback) {
                         uniqueData.push(MSP_codes.MSP_SET_SENSOR_ALIGNMENT);
                         uniqueData.push(MSP_codes.MSP_SET_RX_CONFIG);
                         uniqueData.push(MSP_codes.MSP_SET_FAILSAFE_CONFIG);
-                        uniqueData.push(MSP_codes.MSP_SET_RXFAIL_CONFIG);
                     }
                 }
                 
@@ -755,10 +754,18 @@ function configuration_restore(callback) {
                 MSP.sendLedStripConfig(save_to_eeprom);
             }
             
+            function send_rxfail_config() {
+                if (semver.gte(CONFIG.apiVersion, "1.15.0")) {
+                    MSP.sendRxFailConfig(save_to_eeprom);
+                } else {
+                    save_to_eeprom();
+                }
+            }
+
             function save_to_eeprom() {
                 MSP.send_message(MSP_codes.MSP_EEPROM_WRITE, false, false, reboot);
             }
-            
+
             function reboot() {
                 GUI.log(chrome.i18n.getMessage('eeprom_saved_ok'));
 
diff --git a/js/msp.js b/js/msp.js
index 68a56bf9..6074a5f8 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -1215,14 +1215,6 @@ MSP.crunch = function (code) {
             }
             break;
 
-        case MSP_codes.MSP_SET_RXFAIL_CONFIG:
-            for (var i = 0; i < RXFAIL_CONFIG.length; i++) {
-                buffer.push(RXFAIL_CONFIG[i].mode);
-                buffer.push(lowByte(RXFAIL_CONFIG[i].value));
-                buffer.push(highByte(RXFAIL_CONFIG[i].value));
-            }
-            break;
-
         case MSP_codes.MSP_SET_CHANNEL_FORWARDING:
             for (var i = 0; i < SERVO_CONFIG.length; i++) {
                 var out = SERVO_CONFIG[i].indexOfChannelToForward;
@@ -1359,7 +1351,9 @@ MSP.sendServoConfigurations = function(onCompleteCallback) {
     } else {
         nextFunction();
     }
-    
+
+
+>>>>>>> cleanflight/development
     function send_next_servo_configuration() {
         
         var buffer = [];
@@ -1448,9 +1442,8 @@ MSP.sendModeRanges = function(onCompleteCallback) {
         onCompleteCallback();
     } else {
         send_next_mode_range();
-}
+    }
 
-    
     function send_next_mode_range() {
         
         var modeRange = MODE_RANGES[modeRangeIndex];
@@ -1482,7 +1475,8 @@ MSP.sendAdjustmentRanges = function(onCompleteCallback) {
     } else {
         send_next_adjustment_range();
     }
-    
+
+
     function send_next_adjustment_range() {
         
         var adjustmentRange = ADJUSTMENT_RANGES[adjustmentRangeIndex];
@@ -1583,3 +1577,34 @@ MSP.serialPortFunctionsToMask = function(functions) {
     }
     return mask;
 }
+
+MSP.sendRxFailConfig = function(onCompleteCallback) {
+    var nextFunction = send_next_rxfail_config;
+
+    var rxFailIndex = 0;
+
+    if (RXFAIL_CONFIG.length == 0) {
+        onCompleteCallback();
+    } else {
+        send_next_rxfail_config();
+    }
+
+    function send_next_rxfail_config() {
+
+        var rxFail = RXFAIL_CONFIG[rxFailIndex];
+
+        var buffer = [];
+        buffer.push(rxFailIndex);
+        buffer.push(rxFail.mode);
+        buffer.push(lowByte(rxFail.value));
+        buffer.push(highByte(rxFail.value));
+
+        // prepare for next iteration
+        rxFailIndex++;
+        if (rxFailIndex == RXFAIL_CONFIG.length) {
+            nextFunction = onCompleteCallback;
+
+        }
+        MSP.send_message(MSP_codes.MSP_SET_RXFAIL_CONFIG, buffer, false, nextFunction);
+    }
+};
diff --git a/tabs/failsafe.js b/tabs/failsafe.js
index 60989687..891bbed9 100644
--- a/tabs/failsafe.js
+++ b/tabs/failsafe.js
@@ -317,7 +317,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
             }
 
             function save_rxfail_config() {
-                MSP.send_message(MSP_codes.MSP_SET_RXFAIL_CONFIG, MSP.crunch(MSP_codes.MSP_SET_RXFAIL_CONFIG), false, save_bf_config);
+                MSP.sendRxFailConfig(save_bf_config);
             }
 
             function save_bf_config() {