diff --git a/js/boards.js b/js/boards.js
index 47153026a8..6f0b6bd2fc 100644
--- a/js/boards.js
+++ b/js/boards.js
@@ -35,7 +35,6 @@ var BOARD_DEFINITIONS = [
         name: "SP Racing F3",
         identifier: "SRF3"
     }
-   }
 ];
 
 var DEFAULT_BOARD_DEFINITION = {
diff --git a/js/msp.js b/js/msp.js
index 1ed218dd19..d772710e31 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -619,7 +619,12 @@ var MSP = {
                 break;
             case MSP_codes.MSP_CHANNEL_FORWARDING:
                 for (var i = 0; i < 8; i ++) {
-                    SERVO_CONFIG[i].indexOfChannelToForward = data.getUint8(i);
+                    var channelIndex = data.getUint8(i);
+                    if (channelIndex < 255) {
+                        SERVO_CONFIG[i].indexOfChannelToForward;
+                    } else {
+                        SERVO_CONFIG[i].indexOfChannelToForward = undefined;
+                    }
                 }
                 break;
 
@@ -915,7 +920,11 @@ MSP.crunch = function (code) {
             break;
         case MSP_codes.MSP_SET_CHANNEL_FORWARDING:
             for (var i = 0; i < SERVO_CONFIG.length; i++) {
-                buffer.push(SERVO_CONFIG[i].indexOfChannelToForward);
+                var out = SERVO_CONFIG[i].indexOfChannelToForward;
+                if (out == undefined) {
+                    out = 255; // Cleanflight defines "CHANNEL_FORWARDING_DISABLED" as "(uint8_t)0xFF"
+                }
+                buffer.push(out);
             }
             break;
         case MSP_codes.MSP_SET_CF_SERIAL_CONFIG:
diff --git a/tabs/servos.js b/tabs/servos.js
index a0e352ab69..46b7ca85b0 100644
--- a/tabs/servos.js
+++ b/tabs/servos.js
@@ -163,9 +163,12 @@ TABS.servos.initialize = function (callback) {
 
 
                 var selection = $('.channel input', this);
-                var val = selection.index(selection.filter(':checked'));
-
-                SERVO_CONFIG[info.obj].indexOfChannelToForward = parseInt(val);
+                var channelIndex = parseInt(selection.index(selection.filter(':checked')));
+                if (channelIndex == -1) {
+                    channelIndex = undefined;
+                }
+                
+                SERVO_CONFIG[info.obj].indexOfChannelToForward = channelIndex;
 
                 
                 SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val());