diff --git a/pgcommitfest/commitfest/templates/commitfest.html b/pgcommitfest/commitfest/templates/commitfest.html
index 886712fc..a343af91 100644
--- a/pgcommitfest/commitfest/templates/commitfest.html
+++ b/pgcommitfest/commitfest/templates/commitfest.html
@@ -22,13 +22,16 @@
   <b>Status summary: </b>{%for id,title,num in statussummary%}<a href="?status={{id}}">{{title}}</a>: {{num}}. {%endfor%}
  </p>
 
- {%for p in patches %}
+{%for p in patches %}
   {%ifchanged p.is_open%}
+   {% if not cf.draft or p.is_open %}
    {%if not forloop.first%}
     </tbody>
     </table>
    {%endif%}
-   <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
+{% if not cf.draft or p.is_open %}
+  <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
+{% endif %}
    <table class="table table-striped table-bordered table-hover">
     <thead>
      <tr>