diff --git a/tlapbot/owncast_redeem_dashboard.py b/tlapbot/owncast_redeem_dashboard.py
index 9274685..df09ee2 100644
--- a/tlapbot/owncast_redeem_dashboard.py
+++ b/tlapbot/owncast_redeem_dashboard.py
@@ -8,7 +8,8 @@ bp = Blueprint('redeem_dashboard', __name__)
 def dashboard():
     queue = pretty_redeem_queue(get_db())
     number_of_drinks = 0
-    for row in queue:
-        if row[1] == "drink":
-            number_of_drinks += 1
+    if queue is not None:
+        for row in queue:
+            if row[1] == "drink":
+                number_of_drinks += 1
     return render_template('dashboard.html', queue=queue, number_of_drinks=number_of_drinks)
\ No newline at end of file
diff --git a/tlapbot/templates/dashboard.html b/tlapbot/templates/dashboard.html
index 2799937..76c8250 100644
--- a/tlapbot/templates/dashboard.html
+++ b/tlapbot/templates/dashboard.html
@@ -11,7 +11,7 @@
             <td> {{ number_of_drinks }} </td>
         </tbody>
     </table>
-
+    {% if queue %}
     <table>
         <thead>
             <tr>
@@ -28,5 +28,6 @@
         </tbody>
         {% endfor %}
     </table>
+    {% endif %}
 </body>
 </html>
\ No newline at end of file