diff --git a/static/js/subs.js b/static/js/subs.js
index 4ff355e5d3..f8fbf4b17e 100644
--- a/static/js/subs.js
+++ b/static/js/subs.js
@@ -27,7 +27,7 @@ function row_for_stream_id(stream_id) {
 
 function settings_button_for_sub(sub) {
     var id = parseInt(sub.stream_id, 10);
-    return $(".subscription_settings[data-stream-id='" + id + "'] .subscribe-button");
+    return $(".subscription_settings[data-stream-id='" + id + "'] .subscribe-button").expectOne();
 }
 
 function get_row_data(row) {
@@ -212,7 +212,7 @@ exports.remove_stream = function (stream_id) {
 
 exports.update_settings_for_subscribed = function (sub) {
     var button = button_for_sub(sub);
-    var settings_button = settings_button_for_sub(sub).removeClass("unsubscribed");
+    var settings_button = settings_button_for_sub(sub).removeClass("unsubscribed").show();
 
     if (button.length !== 0) {
         exports.rerender_subscribers_count(sub, true);
@@ -236,7 +236,7 @@ exports.update_settings_for_subscribed = function (sub) {
 
 exports.update_settings_for_unsubscribed = function (sub) {
     var button = button_for_sub(sub);
-    var settings_button = settings_button_for_sub(sub).addClass("unsubscribed");
+    var settings_button = settings_button_for_sub(sub).addClass("unsubscribed").show();
 
     button.toggleClass("checked");
     settings_button.text(i18n.t("Subscribe"));
diff --git a/static/templates/subscription_settings.handlebars b/static/templates/subscription_settings.handlebars
index 2e62a83ba9..40553d489a 100644
--- a/static/templates/subscription_settings.handlebars
+++ b/static/templates/subscription_settings.handlebars
@@ -21,10 +21,8 @@
                 {{#if is_admin}}
                 <button class="button small rounded btn-danger deactivate" type="button" name="delete_button" title="{{t 'Delete stream'}}">{{t 'Delete' }} <i class="icon-vector-trash" aria-hidden="true"></i></button>
                 {{/if}}
-                {{#if should_display_subscription_button}}
-                <button class="button small rounded subscribe-button sub_unsub_button {{#unless subscribed }}unsubscribed{{/unless}}" type="button" name="button" title="{{t 'Toggle subscription'}} (S)">
+                <button class="button small rounded subscribe-button sub_unsub_button {{#unless subscribed }}unsubscribed{{/unless}}" type="button" name="button" title="{{t 'Toggle subscription'}} (S)" {{#unless should_display_subscription_button}}style="display: none"{{/unless}}>
                     {{#if subscribed }}{{#tr oneself }}Unsubscribe{{/tr}}{{else}}{{#tr oneself }}Subscribe{{/tr}}{{/if}}</button>
-                {{/if}}
                 {{#if invite_only}}
                     {{#if subscribed}}
                         <a href="{{preview_url}}" class="button small rounded" id="preview-stream-button" role="button" title="{{t 'View stream'}} (V)">{{t "View stream"}}</a>