diff --git a/src/pretixpresale/templates/pretixpresale/event/index.html b/src/pretixpresale/templates/pretixpresale/event/index.html
index 99be0decbb..4c7b7e78c5 100644
--- a/src/pretixpresale/templates/pretixpresale/event/index.html
+++ b/src/pretixpresale/templates/pretixpresale/event/index.html
@@ -29,7 +29,8 @@
                             </div>
                             {% if var.cached_availability.0 == 100 %}
                                 <div class="col-md-2 col-xs-6 availability-box available">
-                                    <input type="number" class="form-control input-item-count" placeholder="0" min="0">
+                                    <input type="number" class="form-control input-item-count" placeholder="0" min="0"
+                                            max="{{ var.cached_availability.1 }}">
                                 </div>
                             {% else %}
                                 {% include "pretixpresale/event/fragment_availability.html" with avail=var.cached_availability.0 %}
@@ -53,7 +54,8 @@
                         </div>
                         {% if item.cached_availability.0 == 100 %}
                             <div class="col-md-2 col-xs-6 availability-box available">
-                                <input type="number" class="form-control input-item-count" placeholder="0" min="0">
+                                <input type="number" class="form-control input-item-count" placeholder="0" min="0"
+                                        max="{{ item.cached_availability.1 }}">
                             </div>
                         {% else %}
                             {% include "pretixpresale/event/fragment_availability.html" with avail=item.cached_availability.0 %}
diff --git a/src/pretixpresale/views/event.py b/src/pretixpresale/views/event.py
index af09c9f0d8..a1e8bcfff0 100644
--- a/src/pretixpresale/views/event.py
+++ b/src/pretixpresale/views/event.py
@@ -30,11 +30,15 @@ class EventIndex(EventViewMixin, TemplateView):
             item.has_variations = (len(item.available_variations) != 1
                                    or not item.available_variations[0].empty())
             if not item.has_variations:
-                item.cached_availability = item.availability()
+                item.cached_availability = list(item.availability())
+                item.cached_availability[1] = min(item.cached_availability[1],
+                                                  self.request.event.max_items_per_order)
                 item.price = item.available_variations[0]['price']
             else:
                 for var in item.available_variations:
-                    var.cached_availability = var['variation'].availability()
+                    var.cached_availability = list(var['variation'].availability())
+                    var.cached_availability[1] = min(var.cached_availability[1],
+                                                     self.request.event.max_items_per_order)
 
         # Regroup those by category
         context['items_by_category'] = sorted([