diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 1261a53d1a..08e8541f2f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -222,6 +222,9 @@
     "initialSetupBatteryMahValue": {
         "message": "$1 mAh"
     },
+    "initialSetupBatteryAValue": {
+        "message": "$1 A"
+    },
     "initialSetupRSSI": {
         "message": "RSSI:"
     },
diff --git a/js/msp.js b/js/msp.js
index ca58ea80ab..d6723f1411 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -241,7 +241,7 @@ MSP.process_data = function(code, message_buffer, message_length) {
             ANALOG.voltage = data.getUint8(0) / 10.0;
             ANALOG.mAhdrawn = data.getUint16(1, 1);
             ANALOG.rssi = data.getUint16(3, 1); // 0-1023
-            ANALOG.amperage = data.getUint16(5, 1) * 1000; // convert from A to mA
+            ANALOG.amperage = data.getUint16(5, 1) / 100; // A
             break;
         case MSP_codes.MSP_RC_TUNING:
             RC_tuning.RC_RATE = parseFloat((data.getUint8(0) / 100).toFixed(2));
diff --git a/tabs/initial_setup.html b/tabs/initial_setup.html
index 3bd1166f91..a38e6c2d73 100644
--- a/tabs/initial_setup.html
+++ b/tabs/initial_setup.html
@@ -77,7 +77,7 @@
                 <dl>
                     <dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd>
                     <dt i18n="initialSetupDrawn"></dt><dd class="bat-mah-drawn">0 mAh</dd>
-                    <dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 mAh</dd>
+                    <dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 A</dd>
                     <dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
                 </dl>
             </div>
diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js
index 303099b311..a962cb7ff2 100644
--- a/tabs/initial_setup.js
+++ b/tabs/initial_setup.js
@@ -245,7 +245,7 @@ function tab_initialize_initial_setup() {
             // Update voltage indicator
             $('.bat-voltage').text(chrome.i18n.getMessage('initialSetupBatteryValue', [ANALOG.voltage]));
             $('.bat-mah-drawn').text(chrome.i18n.getMessage('initialSetupBatteryMahValue', [ANALOG.mAhdrawn]));
-            $('.bat-mah-drawing').text(chrome.i18n.getMessage('initialSetupBatteryMahValue', [ANALOG.amperage]));
+            $('.bat-mah-drawing').text(chrome.i18n.getMessage('initialSetupBatteryAValue', [ANALOG.amperage.toFixed(2)]));
             $('.rssi').text(chrome.i18n.getMessage('initialSetupRSSIValue', [((ANALOG.rssi / 1023) * 100).toFixed(0)]));
 
             // Update cube