diff --git a/tabs/configuration.css b/tabs/configuration.css
index 8bc112c0..43b88053 100644
--- a/tabs/configuration.css
+++ b/tabs/configuration.css
@@ -295,7 +295,7 @@
     width: 30px;
 }
 
-.tab-configuration .batterymetertype {
+.tab-configuration select.batterymetertype {
     border: 1px solid silver;
     margin-right: 5px;
     float: left;
diff --git a/tabs/configuration.html b/tabs/configuration.html
index 5fe32a7a..16ecc954 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -339,7 +339,7 @@
                             <!-- table generated here -->
                         </tbody>
                     </table>
-                    <div class="select">
+                    <div class="select batterymetertype">
                         <label>
                             <select class="batterymetertype"><!-- list generated here --></select>
                             <span i18n="configurationBatteryMeterType"></span>
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 81ba3ef5..4c0fb08b 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -444,22 +444,26 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         $('input[name="mincommand"]').val(MISC.mincommand);
 
         // fill battery
-        var batteryMeterTypes = [
-            'Onboard ADC',
-            'ESC Sensor',
-        ];
+        if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
+            var batteryMeterTypes = [
+                'Onboard ADC',
+                'ESC Sensor'
+            ];
 
-        var batteryMeterType_e = $('select.batterymetertype');
-        for (i = 0; i < batteryMeterTypes.length; i++) {
-            batteryMeterType_e.append('<option value="' + i + '">' + batteryMeterTypes[i] + '</option>');
+            var batteryMeterType_e = $('select.batterymetertype');
+            for (i = 0; i < batteryMeterTypes.length; i++) {
+                batteryMeterType_e.append('<option value="' + i + '">' + batteryMeterTypes[i] + '</option>');
+            }
+
+            batteryMeterType_e.change(function () {
+                MISC.batterymetertype = parseInt($(this).val());
+                checkDisableVbatControls();
+            });
+            batteryMeterType_e.val(MISC.batterymetertype).change();
+        } else {
+            $('div.batterymetertype').hide();
         }
 
-        batteryMeterType_e.change(function () {
-            MISC.batterymetertype = parseInt($(this).val());
-            checkDisableVbatControls();
-        });
-        batteryMeterType_e.val(MISC.batterymetertype).change();
-
         $('input[name="mincellvoltage"]').val(MISC.vbatmincellvoltage);
         $('input[name="maxcellvoltage"]').val(MISC.vbatmaxcellvoltage);
         $('input[name="warningcellvoltage"]').val(MISC.vbatwarningcellvoltage);
@@ -469,10 +473,13 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         var currentMeterTypes = [
             'None',
             'Onboard ADC',
-            'Virtual',
-            'ESC Sensor',
+            'Virtual'
         ];
 
+        if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
+            currentMeterTypes.push('ESC Sensor');
+        }
+
         var currentMeterType_e = $('select.currentmetertype');
         for (i = 0; i < currentMeterTypes.length; i++) {
             currentMeterType_e.append('<option value="' + i + '">' + currentMeterTypes[i] + '</option>');
@@ -528,25 +535,33 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         }
 
         function checkDisableVbatControls() {
-            if (BF_CONFIG.features.isEnabled('VBAT')) {
-                $('select.batterymetertype').prop('disabled', false);
-                if (MISC.batterymetertype == 1) {
-                    $('input[name="mincellvoltage"]').prop('disabled', true);
-                    $('input[name="maxcellvoltage"]').prop('disabled', true);
-                    $('input[name="warningcellvoltage"]').prop('disabled', true);
-                    $('input[name="voltagescale"]').prop('disabled', true);
+            function disableBatteryControls(disabled) {
+                $('input[name="mincellvoltage"]').prop('disabled', disabled);
+                $('input[name="maxcellvoltage"]').prop('disabled', disabled);
+                $('input[name="warningcellvoltage"]').prop('disabled', disabled);
+                $('input[name="voltagescale"]').prop('disabled', disabled);
+            }
+
+            if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
+                if (BF_CONFIG.features.isEnabled('VBAT')) {
+                    $('select.batterymetertype').prop('disabled', false);
+
+                    if (MISC.batterymetertype == 1) {
+                        disableBatteryControls(true);
+                    } else {
+                        disableBatteryControls(false);
+                    }
                 } else {
-                    $('input[name="mincellvoltage"]').prop('disabled', false);
-                    $('input[name="maxcellvoltage"]').prop('disabled', false);
-                    $('input[name="warningcellvoltage"]').prop('disabled', false);
-                    $('input[name="voltagescale"]').prop('disabled', false);
+                    $('select.batterymetertype').prop('disabled', true);
+
+                    disableBatteryControls(true);
                 }
             } else {
-                $('select.batterymetertype').prop('disabled', true);
-                $('input[name="mincellvoltage"]').prop('disabled', true);
-                $('input[name="maxcellvoltage"]').prop('disabled', true);
-                $('input[name="warningcellvoltage"]').prop('disabled', true);
-                $('input[name="voltagescale"]').prop('disabled', true);
+                if (BF_CONFIG.features.isEnabled('VBAT')) {
+                    disableBatteryControls(false);
+                } else {
+                    disableBatteryControls(true);
+                }
             }
         }