diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js
index 31ec1bd9ed..3c28cf9c68 100644
--- a/zephyr/static/js/subs.js
+++ b/zephyr/static/js/subs.js
@@ -168,6 +168,7 @@ exports.fetch = function () {
         timeout:  10*1000,
         success: function (data) {
             $('#subscriptions_table tr').remove();
+            removed_streams = {};
             if (data) {
                 var subscriptions = [];
                 $.each(data.subscriptions, function (index, data) {
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 913455f904..64b99f84a4 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -509,6 +509,8 @@ $(function () {
         hashchange.changehash(browser_url);
     });
 
+    // TODO: We really want to show a spinner while we're fetching
+    // the subs
     $('#sidebar a[href="#subscriptions"]').on('show', subs.fetch);
 
     var settings_status = $('#settings-status');