diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py
index acdb20c13c..fda7545a03 100644
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -1619,6 +1619,9 @@ class QuotaFilterForm(FilterForm):
         if fdata.get('weekday'):
             qs = qs.annotate(wday=ExtractWeekDay('subevent__date_from')).filter(wday__in=fdata.get('weekday'))
 
+        if fdata.get('subevent'):
+            qs = qs.filter(subevent=fdata["subevent"])
+
         if fdata.get('query'):
             query = fdata.get('query')
             qs = qs.filter(name__icontains=query)
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html b/src/pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html
index 3e9d7d60c3..2420d8bf12 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota_delete_bulk.html
@@ -7,7 +7,11 @@
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% if allowed %}
-            <p>{% blocktrans %}Are you sure you want to delete the following quotas?{% endblocktrans %}</p>
+            <p>{% blocktrans trimmed count num=allowed|length %}
+                Are you sure you want to delete the following quota?
+            {% plural %}
+                Are you sure you want to delete the following {{ num }} quotas?
+            {% endblocktrans %}</p>
             <ul>
                 {% for q in allowed %}
                     <li>
diff --git a/src/pretix/control/templates/pretixcontrol/items/quotas.html b/src/pretix/control/templates/pretixcontrol/items/quotas.html
index 9e4fe83914..0da36c9be5 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quotas.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quotas.html
@@ -17,13 +17,9 @@
     {% if quotas|length == 0 and not filter_form.filtered %}
         <div class="empty-collection">
             <p>
-                {% if request.GET.subevent %}
-                    {% trans "Your search did not match any quotas." %}
-                {% else %}
-                    {% blocktrans trimmed %}
-                        You haven't created any quotas yet.
-                    {% endblocktrans %}
-                {% endif %}
+                {% blocktrans trimmed %}
+                    You haven't created any quotas yet.
+                {% endblocktrans %}
             </p>
 
             {% if 'event.items:write' in request.eventpermset %}