diff --git a/src/pretix/control/forms/item.py b/src/pretix/control/forms/item.py
index 9c368ba42e..1f2fceca1c 100644
--- a/src/pretix/control/forms/item.py
+++ b/src/pretix/control/forms/item.py
@@ -158,6 +158,9 @@ class QuestionForm(I18nModelForm):
             self.fields['items'].required = True
         else:
             del self.fields['items']
+            del self.fields['ask_during_checkin']
+            del self.fields['show_during_checkin']
+            del self.fields['print_on_invoice']
         self.fields['dependency_question'].widget.attrs['data-container-type'] = self.instance.container_type
         self.fields['dependency_question'].queryset = self.instance.event.questions.filter(
             type__in=(Question.TYPE_BOOLEAN, Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE),
diff --git a/src/pretix/control/templates/pretixcontrol/items/question_edit.html b/src/pretix/control/templates/pretixcontrol/items/question_edit.html
index 5cc04407c2..d241be5651 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question_edit.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question_edit.html
@@ -130,10 +130,16 @@
                 <legend>{% trans "Advanced" %}</legend>
                 {% bootstrap_field form.help_text layout="control" %}
                 {% bootstrap_field form.identifier layout="control" %}
-                {% bootstrap_field form.ask_during_checkin layout="control" %}
-                {% bootstrap_field form.show_during_checkin layout="control" %}
+                {% if form.ask_during_checkin %}
+                    {% bootstrap_field form.ask_during_checkin layout="control" %}
+                {% endif %}
+                {% if form.show_during_checkin %}
+                    {% bootstrap_field form.show_during_checkin layout="control" %}
+                {% endif %}
                 {% bootstrap_field form.hidden layout="control" %}
-                {% bootstrap_field form.print_on_invoice layout="control" %}
+                {% if form.print_on_invoice %}
+                    {% bootstrap_field form.print_on_invoice layout="control" %}
+                {% endif %}
 
                 <div class="form-group">
                     <label class="col-md-3 control-label" for="id_dependency_question">