diff --git a/index.html b/index.html
index f7345ca..8fdc588 100644
--- a/index.html
+++ b/index.html
@@ -63,12 +63,12 @@ <h2>Recoveries</h2>
             <hr/>
             <p>Recovery reports can be added on the Chase-Car pane.</p>
             <hr/>
-            <div id="recovery-list">No recent recoveries :-(</div>
+            <div id="recovery-list"><img style="width:90px;height:30px;display:block;margin:auto;" src="img/hab-spinner.gif"/><br></div>
         </div>
         <div class="slimContainer">
             <h2>Statistics</h2>
             <hr/>
-            <div id="leaderboard-list">No leaderboard data :-(</div>
+            <div id="leaderboard-list"><img style="width:90px;height:30px;display:block;margin:auto;" src="img/hab-spinner.gif"/><br></div>
         </div>
     </div>
     <div id="aboutbox" style="display: none" class="flatpage">
diff --git a/js/tracker.js b/js/tracker.js
index daccab9..8d81bba 100644
--- a/js/tracker.js
+++ b/js/tracker.js
@@ -3295,6 +3295,8 @@ function refreshRecoveries() {
             }
         },
         error: function() {
+            updateRecoveryPane([]);
+            updateLeaderboardPane([]);
         },
         complete: function(request, textStatus) {
             periodical_recoveries = setTimeout(refreshRecoveries, 600 * 1000);
@@ -3706,6 +3708,10 @@ function updateRecoveryPane(r){
         }
     }
 
+    if (html == "") {
+        html = "<div>No recent recoveries :-(</div>"
+    }
+
     $("#recovery-list").html(html);
 
 }
@@ -3748,6 +3754,10 @@ function updateLeaderboardPane(r){
         html += "<div><b>" + (parseInt(i)+1) + ". </b>" + list[i][0] + " - " + list[i][1] + "</div>";
     }
 
+    if (r.length == 0) {
+        html = "<div>No recent recoveries :-(</div>"
+    }
+
     $("#leaderboard-list").html(html);
 
 }