diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 58f77492..8f52f13e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -379,6 +379,9 @@
     "configurationBatteryMinimum": {
         "message": "Minimum Cell Voltage"
     },
+    "configurationBatteryWarning": {
+        "message": "Warning Cell Voltage"
+    },
     "configurationBatteryMaximum": {
         "message": "Maximum Cell Voltage"
     },
diff --git a/js/msp.js b/js/msp.js
index e6a6fe9c..ac2229ad 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -305,7 +305,7 @@ var MSP = {
                 MISC.vbatscale = data.getUint8(18, 1); // 10-200
                 MISC.vbatmincellvoltage = data.getUint8(19, 1) / 10; // 10-50
                 MISC.vbatmaxcellvoltage = data.getUint8(20, 1) / 10; // 10-50
-                MISC.placeholder3 = data.getUint8(21, 1);
+                MISC.vbatwarningcellvoltage = data.getUint8(21, 1) / 10; // 10-50
                 break;
             case MSP_codes.MSP_MOTOR_PINS:
                 console.log(data);
@@ -679,7 +679,7 @@ MSP.crunch = function (code) {
             buffer.push(MISC.vbatscale);
             buffer.push(MISC.vbatmincellvoltage * 10);
             buffer.push(MISC.vbatmaxcellvoltage * 10);
-            buffer.push(MISC.placeholder3);
+            buffer.push(MISC.vbatwarningcellvoltage * 10);
             break;
         case MSP_codes.MSP_SET_SERVO_CONF:
             for (var i = 0; i < SERVO_CONFIG.length; i++) {
diff --git a/tabs/configuration.html b/tabs/configuration.html
index b84451b9..d651b7f4 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -106,6 +106,12 @@
                 <span i18n="configurationBatteryMinimum"></span>
             </label>
         </div>
+        <div class="number">
+            <label>
+                <input type="number" name="warningcellvoltage" step="0.1" min="1" max="5" />
+                <span i18n="configurationBatteryWarning"></span>
+            </label>
+        </div>
         <div class="number">
             <label>
                 <input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" />
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 7e741b31..29916de7 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -211,6 +211,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
         // fill battery
         $('input[name="mincellvoltage"]').val(MISC.vbatmincellvoltage);
+        $('input[name="warningcellvoltage"]').val(MISC.vbatwarningcellvoltage);
         $('input[name="maxcellvoltage"]').val(MISC.vbatmaxcellvoltage);
         $('input[name="voltagescale"]').val(MISC.vbatscale);
 
@@ -250,6 +251,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             MISC.mincommand = parseInt($('input[name="mincommand"]').val());
 
             MISC.vbatmincellvoltage = parseFloat($('input[name="mincellvoltage"]').val());
+            MISC.vbatwarningcellvoltage = parseFloat($('input[name="warningcellvoltage"]').val());
             MISC.vbatmaxcellvoltage = parseFloat($('input[name="maxcellvoltage"]').val());
             MISC.vbatscale = parseInt($('input[name="voltagescale"]').val());