diff --git a/js/fc.js b/js/fc.js
index 87c38273..bd237c23 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -170,7 +170,8 @@ var FC = {
             voltage:    0,
             mAhdrawn:   0,
             rssi:       0,
-            amperage:   0
+            amperage:   0,
+            last_received_timestamp: Date.now()
         };
         
         ARMING_CONFIG = {
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index 80a86094..595f1608 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -115,7 +115,7 @@ MspHelper.prototype.process_data = function(dataHandler) {
             ANALOG.mAhdrawn = data.getUint16(1, 1);
             ANALOG.rssi = data.getUint16(3, 1); // 0-1023
             ANALOG.amperage = data.getInt16(5, 1) / 100; // A
-            // this.analog_last_received_timestamp = Date.now(); //TODO, fix this
+            ANALOG.last_received_timestamp = Date.now();
             break;
         case MSPCodes.MSP_RC_TUNING:
             var offset = 0;
diff --git a/js/serial_backend.js b/js/serial_backend.js
index d759d84f..e8912a0c 100755
--- a/js/serial_backend.js
+++ b/js/serial_backend.js
@@ -475,7 +475,7 @@ function update_live_status() {
         MSP.send_message(MSPCodes.MSP_ANALOG, false, false);
     }
     
-    var active = ((Date.now() - MSP.analog_last_received_timestamp) < 300);
+    var active = ((Date.now() - ANALOG.last_received_timestamp) < 300);
 
     for (var i = 0; i < AUX_CONFIG.length; i++) {
        if (AUX_CONFIG[i] == 'ARM') {