diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
index f1feb27f04..ed79831572 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html
@@ -37,11 +37,8 @@
                                             {% plural %}
                                                 You need to choose {{ min_count }} options from this category.
                                             {% endblocktrans %}
-                                        {% elif c.min_count == 0 %}
-                                            {% blocktrans trimmed count max_count=c.max_count %}
-                                                You can choose at most one option from this category.
-                                            {% plural %}
-                                                You can choose up to {{ max_count }} options from this category.
+                                        {% elif c.min_count == 0 and c.max_count >= c.form.fields|length %}
+                                            {% blocktrans %}
                                             {% endblocktrans %}
                                         {% else %}
                                             {% blocktrans trimmed with min_count=c.min_count max_count=c.max_count %}