diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js
index 38a01ae6..21eca81d 100644
--- a/src/js/msp/MSPHelper.js
+++ b/src/js/msp/MSPHelper.js
@@ -824,11 +824,13 @@ MspHelper.prototype.process_data = function (dataHandler) {
                     console.log("Fw git rev:", FC.CONFIG.gitRevision);
 
                     if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
-                        let option = data.readU16();
-                        while (option) {
+                        FC.CONFIG.buildOptions = [];
+                        let option;
+                        while ((option = data.readU16())) {
                             FC.CONFIG.buildOptions.push(option);
-                            option = data.readU16();
                         }
+                        // Humanize the build options
+                        FC.processBuildOptions();
                     }
 
                     break;
diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
index 0d21f64a..bf5d717c 100644
--- a/src/js/serial_backend.js
+++ b/src/js/serial_backend.js
@@ -323,11 +323,6 @@ function onOpen(openInfo) {
                             MSP.send_message(MSPCodes.MSP_BUILD_INFO, false, false, function () {
                                 gui_log(i18n.getMessage("buildInfoReceived", [FC.CONFIG.buildInfo]));
 
-                                // retrieve build options from the flight controller
-                                if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
-                                    FC.processBuildOptions();
-                                }
-
                                 MSP.send_message(MSPCodes.MSP_BOARD_INFO, false, false, processBoardInfo);
                             });
                         });
@@ -634,7 +629,10 @@ function connectCli() {
 }
 
 function onConnect() {
-    if ($("a.firmware_flasher_button__label").hasClass("active") || $("a.firmware_flasher_button__link").hasClass("active")) {
+    if (
+        $("a.firmware_flasher_button__label").hasClass("active") ||
+        $("a.firmware_flasher_button__link").hasClass("active")
+    ) {
         $("a.firmware_flasher_button__label").removeClass("active");
         $("a.firmware_flasher_button__link").removeClass("active");
     }