diff --git a/src/sage/server/notebook/templates/list_top.html b/src/sage/server/notebook/templates/list_top.html
index 6f07b6916d9..7dce7ad744a 100644
--- a/src/sage/server/notebook/templates/list_top.html
+++ b/src/sage/server/notebook/templates/list_top.html
@@ -4,8 +4,10 @@
 {% if pub is not defined or not pub %}
 <a class="boldusercontrol" href="/new_worksheet" target="_blank">New Worksheet</a>
 <a class="boldusercontrol" href="/upload">Upload</a>
+{% if not accounts %}
 <a class="boldusercontrol" href="/download_worksheets">Download All</a>
 {% endif %}
+{% endif %}
 
 {% include 'search.html' %}
 
diff --git a/src/sage/server/notebook/templates/worksheet_listing.html b/src/sage/server/notebook/templates/worksheet_listing.html
index a17bbdb5a8c..4ae27068958 100644
--- a/src/sage/server/notebook/templates/worksheet_listing.html
+++ b/src/sage/server/notebook/templates/worksheet_listing.html
@@ -50,7 +50,9 @@
     {% endif %}
 
     <button onClick="stop_worksheets_button();" title="Stop selected worksheets">Stop</button>
+    {% if not accounts %}
     <button onClick="download_worksheets_button();" title="Download selected worksheets">Download</button>
+    {% endif %}
     <span style="padding-left:100px;">
 
     Current Folder:
diff --git a/src/sage/server/notebook/twist.py b/src/sage/server/notebook/twist.py
index 809f9f5f442..6b363d5c404 100644
--- a/src/sage/server/notebook/twist.py
+++ b/src/sage/server/notebook/twist.py
@@ -1479,6 +1479,8 @@ def render_worksheet_list(args, pub, username):
     if pub and (not username or username == tuple([])):
         username = 'pub'
 
+    accounts = notebook.get_accounts()
+
     return template('worksheet_listing.html', **locals())