diff --git a/overpass/archive.py b/overpass/archive.py
index 65cab87..6673070 100644
--- a/overpass/archive.py
+++ b/overpass/archive.py
@@ -113,10 +113,7 @@ def list_archived_streams() -> Text:
         Text: Static page rendered by Flask.
     """
     archive = get_archived_streams()
-    if archive:
-        return render_template("archive.html", archive=archive)
-    else:
-        return render_template("archive.html")
+    return render_template("archive.html", archive=archive)
 
 
 @bp.route("/download/<unique_id>")
diff --git a/overpass/templates/archive.html b/overpass/templates/archive.html
index ec44f44..16d6e92 100644
--- a/overpass/templates/archive.html
+++ b/overpass/templates/archive.html
@@ -5,7 +5,7 @@
 {% block content %}
 {% include "header.html" %}
 <h5>Archive</h5>
-{% if archive is defined %}
+{% if archive is defined and archive|length %}
   <table class="table table-borderless">
   <thead>
     <tr>