diff --git a/public_html/index.html b/public_html/index.html
index df2285c..5c2555d 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -213,7 +213,7 @@
 										</tr>
 										<tr class="infoblock_body">
 											<td><span class="infoBlockTitleText">Total Aircraft:</span> <span id="dump1090_total_ac">n/a</span></td>
-											<td><span class="infoBlockTitleText">ADS-B Message Rate:</span> <span id="dump1090_message_rate">n/a</span></td>
+											<td id="adsb_message_rate_row"><span class="infoBlockTitleText">ADS-B Message Rate:</span> <span id="dump1090_message_rate">n/a</span></td>
 										</tr>
 			
 										<tr class="infoblock_body">
@@ -420,7 +420,7 @@
 									<div>
 										<div class="legend">
 											<div class="sourceCheckbox" id="adsb_datasource_checkbox"></div>
-											<div class="legendTitle vPosition">ADS-B</div>
+											<div class="legendTitle vPosition" id="adsb_datasource_label">ADS-B</div>
 											<div class="sourceCheckbox" id="uat_datasource_checkbox"></div>
 											<div class="legendTitle uat" id="uat_datasource_label">UAT</div>
 											<div class="sourceCheckbox" id="mlat_datasource_checkbox"></div>
diff --git a/public_html/script.js b/public_html/script.js
index 51098c0..f654e9d 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -195,24 +195,25 @@ function processReceiverUpdate(data, receiver_source) {
 }
 
 function fetchData() {
-        if (FetchPending !== null && FetchPending.state() == 'pending') {
-                // don't double up on fetches, let the last one resolve
-                return;
+        if (ADSB_Enabled) {
+                if (FetchPending !== null && FetchPending.state() == 'pending') {
+                        // don't double up on fetches, let the last one resolve
+                        return;
+                }
+
+                FetchPending = $.ajax({ url: 'data/aircraft.json',
+                                        timeout: 5000,
+                                        cache: false,
+                                        dataType: 'json' });
+                FetchPending.done(function(data) {
+                        process_aircraft_json(data, 'dump1090-fa');
+                });
+
+                FetchPending.fail(function(jqxhr, status, error) {
+                        $("#update_error_detail").text("AJAX call failed (" + status + (error ? (": " + error) : "") + "). Maybe dump1090 is no longer running?");
+                        $("#update_error").css('display','block');
+                });
         }
-
-        FetchPending = $.ajax({ url: 'data/aircraft.json',
-                                timeout: 5000,
-                                cache: false,
-                                dataType: 'json' });
-        FetchPending.done(function(data) {
-                process_aircraft_json(data, 'dump1090-fa');
-        });
-
-        FetchPending.fail(function(jqxhr, status, error) {
-                $("#update_error_detail").text("AJAX call failed (" + status + (error ? (": " + error) : "") + "). Maybe dump1090 is no longer running?");
-                $("#update_error").css('display','block');
-        });
-
         // Fetch UAT if enabled
         if (UAT_Enabled) {
                 if (FetchPending_UAT !== null && FetchPending_UAT.state() == 'pending') {
@@ -1303,8 +1304,15 @@ function refreshSelected() {
         $('#dump1090_total_history').text(TrackedHistorySize);
         $('#active_filter_count').text(ActiveFilterCount);
 
-        if (MessageRate !== null) {
-                $('#dump1090_message_rate').text(MessageRate.toFixed(1) + '/sec');
+        if (ADSB_Enabled) {
+                $('#adsb_datasource_checkbox, #adsb_datasource_label').show();
+                $('#adsb_message_rate_row').show();
+                if (MessageRate !== null) {
+                        $('#dump1090_message_rate').text(MessageRate.toFixed(1) + '/sec');
+                }
+        } else {
+                $('#adsb_datasource_checkbox, #adsb_datasource_label').hide();
+                $('#adsb_message_rate_row').hide();
         }
 
         if (UAT_Enabled) {