diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 47d40b7427..46eb6a344a 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -510,8 +510,8 @@
     "receiverChannelMapTitle": {
         "message": "You can define your own channel map by clicking inside the box"
     },
-    "receiverRssiAux": {
-        "message": "RSSI on AUX"
+    "receiverRssiChannel": {
+        "message": "RSSI Channel"
     },
     "receiverRefreshRateTitle": {
         "message": "Graph refresh rate"
diff --git a/js/data_storage.js b/js/data_storage.js
index 836a344154..ba8003d8c4 100644
--- a/js/data_storage.js
+++ b/js/data_storage.js
@@ -131,7 +131,7 @@ var MISC = {
     gps_baudrate:           0,
     gps_ubx_sbas:           0,
     multiwiicurrentoutput:  0,
-    rssi_aux_channel:       0,
+    rssi_channel:           0,
     placeholder2:           0,
     mag_declination:        0, // not checked
     vbatscale:              0,
diff --git a/js/msp.js b/js/msp.js
index 7282444a65..4c9a308ca5 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -321,7 +321,7 @@ var MSP = {
                 MISC.gps_baudrate = data.getUint8(11);
                 MISC.gps_ubx_sbas = data.getInt8(12);
                 MISC.multiwiicurrentoutput = data.getUint8(13);
-                MISC.rssi_aux_channel = data.getUint8(14);
+                MISC.rssi_channel = data.getUint8(14);
                 MISC.placeholder2 = data.getUint8(15);
                 MISC.mag_declination = data.getInt16(16, 1) / 10; // -18000-18000
                 MISC.vbatscale = data.getUint8(18, 1); // 10-200
@@ -819,7 +819,7 @@ MSP.crunch = function (code) {
             buffer.push(MISC.gps_baudrate);
             buffer.push(MISC.gps_ubx_sbas);
             buffer.push(MISC.multiwiicurrentoutput);
-            buffer.push(MISC.rssi_aux_channel);
+            buffer.push(MISC.rssi_channel);
             buffer.push(MISC.placeholder2);
             buffer.push(lowByte(MISC.mag_declination * 10));
             buffer.push(highByte(MISC.mag_declination * 10));
diff --git a/tabs/receiver.css b/tabs/receiver.css
index cf12c0340d..309191b3b3 100644
--- a/tabs/receiver.css
+++ b/tabs/receiver.css
@@ -127,7 +127,7 @@
     line-height: 20px;
     text-align: right;
 }
-.tab-receiver .rssi_aux_wrapper {
+.tab-receiver .rssi_channel_wrapper {
     float: right;
 
     margin: 10px 0 0 0;
@@ -137,7 +137,7 @@
     border: 1px solid #8b8b8b;
     border-left: 0;
 }
-.tab-receiver .rssi_aux_wrapper .head {
+.tab-receiver .rssi_channel_wrapper .head {
     height: 15px;
     padding: 4px;
 
@@ -147,7 +147,7 @@
     border-bottom: 1px solid #8b8b8b;
     background-color: #ececec;
 }
-.tab-receiver .rssi_aux_wrapper select {
+.tab-receiver .rssi_channel_wrapper select {
     width: 100%;
     height: 22px;
 
diff --git a/tabs/receiver.html b/tabs/receiver.html
index c623d26fb2..dd875c73d8 100644
--- a/tabs/receiver.html
+++ b/tabs/receiver.html
@@ -22,14 +22,10 @@
                 <td><input type="number" name="expo" step="0.01" min="0" max="1" /></td>
             </tr>
         </table>
-        <div class="rssi_aux_wrapper">
-            <div class="head" i18n="receiverRssiAux"></div>
-            <select name="rssi_aux_channel">
-                <option value="0">Disabled</option>
-                <option value="1">1</option>
-                <option value="2">2</option>
-                <option value="3">3</option>
-                <option value="4">4</option>
+        <div class="rssi_channel_wrapper">
+            <div class="head" i18n="receiverRssiChannel"></div>
+            <select name="rssi_channel">
+                <!-- list generated here -->
             </select>
         </div>
         <div class="rcmap_wrapper">
diff --git a/tabs/receiver.js b/tabs/receiver.js
index daf2844ad8..bf7cf8e97b 100644
--- a/tabs/receiver.js
+++ b/tabs/receiver.js
@@ -162,8 +162,15 @@ TABS.receiver.initialize = function (callback) {
             $('input[name="rcmap"]').val($(this).val());
         });
 
-        // rssi aux
-        $('select[name="rssi_aux_channel"]').val(MISC.rssi_aux_channel);
+        // rssi
+        
+        var rssi_channel_e = $('select.rssi_channel');
+        rssi_channel_e.append('<option value="0">Disabled</option>');
+        for (var i = 0; i < RC.active_channels; i++) {
+            rssi_channel_e.append('<option value="' + i + '">' + i + '</option>');
+        }
+
+        $('select[name="rssi_channel"]').val(MISC.rssi_channel);
 
         // UI Hooks
         // curves
@@ -272,7 +279,7 @@ TABS.receiver.initialize = function (callback) {
             }
 
             // catch rssi aux
-            MISC.rssi_aux_channel = parseInt($('select[name="rssi_aux_channel"]').val());
+            MISC.rssi_channel = parseInt($('select[name="rssi_channel"]').val());
 
             function save_rc_map() {
                 MSP.send_message(MSP_codes.MSP_SET_RCMAP, MSP.crunch(MSP_codes.MSP_SET_RCMAP), false, save_misc);