diff --git a/src/pretix/control/templates/pretixcontrol/order/change_questions.html b/src/pretix/control/templates/pretixcontrol/order/change_questions.html
index ff44c6421a..25436f5a97 100644
--- a/src/pretix/control/templates/pretixcontrol/order/change_questions.html
+++ b/src/pretix/control/templates/pretixcontrol/order/change_questions.html
@@ -35,7 +35,7 @@
                     </div>
                 </details>
             {% endif %}
-            {% if order_questions_form %}
+            {% if order_questions_form.fields %}
                 <details class="panel panel-default" open>
                     <summary class="panel-heading">
                         <h4 class="panel-title">
diff --git a/src/pretix/presale/templates/pretixpresale/event/order_modify.html b/src/pretix/presale/templates/pretixpresale/event/order_modify.html
index c8208d10fa..f9879cdef2 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order_modify.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order_modify.html
@@ -48,7 +48,7 @@
                     </div>
                 </details>
             {% endif %}
-            {% if order_questions_form %}
+            {% if order_questions_form.fields %}
                 <details class="panel panel-default" open id="invoice-details">
                     <summary class="panel-heading">
                         <h3 class="panel-title">