diff --git a/js/boards.js b/js/boards.js
index 61cda86a..e4216e5c 100644
--- a/js/boards.js
+++ b/js/boards.js
@@ -3,51 +3,40 @@
 var BOARD_DEFINITIONS = [
     {
         name: "CC3D",
-        identifier: "CC3D",
-        serialPortCount: 3
+        identifier: "CC3D"
     }, {
         name: "ChebuzzF3",
-        identifier: "CHF3",
-        serialPortCount: 3
+        identifier: "CHF3"
     }, {
         name: "CJMCU",
-        identifier: "CJM1",
-        serialPortCount: 2
+        identifier: "CJM1"
     }, {
         name: "EUSTM32F103RB",
-        identifier: "EUF1",
-        serialPortCount: 4
+        identifier: "EUF1"
     }, {
         name: "Naze/Flip32+",
-        identifier: "AFNA",
-        serialPortCount: 4
+        identifier: "AFNA"
     }, {
         name: "Naze32Pro",
-        identifier: "AFF3",
-        serialPortCount: 3
+        identifier: "AFF3"
     }, {
         name: "Olimexino",
-        identifier: "OLI1",
-        serialPortCount: 4
+        identifier: "OLI1"
     }, {
         name: "Port103R",
-        identifier: "103R",
-        serialPortCount: 4
+        identifier: "103R"
     }, {
         name: "Sparky",
-        identifier: "SPKY",
-        serialPortCount: 4
+        identifier: "SPKY"
     }, {
         name: "STM32F3Discovery",
-        identifier: "SDF3",
-        serialPortCount: 3
+        identifier: "SDF3"
     }
 ];
 
 var DEFAULT_BOARD_DEFINITION = {
     name: "Unknown",
-    identifier: "????",
-    serialPortCount: 1
+    identifier: "????"
 };
 
 var BOARD = {
diff --git a/js/msp.js b/js/msp.js
index 0a42afe6..1ed218dd 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -556,8 +556,8 @@ var MSP = {
             case MSP_codes.MSP_CF_SERIAL_CONFIG:
                 SERIAL_CONFIG.ports = [];
                 var offset = 0;
-                var serialPortCount = data.byteLength - (4 * 4);
-                for (var i = 0; offset < serialPortCount; i++) {
+                var serialPortCount = (data.byteLength - (4 * 4)) / 2;
+                for (var i = 0; i < serialPortCount; i++) {
                     var serialPort = {
                         identifier: data.getUint8(offset++, 1),
                         scenario: data.getUint8(offset++, 1)
diff --git a/tabs/ports.js b/tabs/ports.js
index 3ef09bb8..45d9632f 100644
--- a/tabs/ports.js
+++ b/tabs/ports.js
@@ -61,7 +61,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
         var ports_e = $('.tab-ports .ports');
         var port_configuration_template_e = $('#tab-ports-templates .portConfiguration');
         
-        for (var portIndex = 0; portIndex < board_definition.serialPortCount; portIndex++) {
+        for (var portIndex = 0; portIndex < SERIAL_CONFIG.ports.length; portIndex++) {
             var port_configuration_e = port_configuration_template_e.clone();
             
             var serialPort = SERIAL_CONFIG.ports[portIndex];