diff --git a/src/pretix/presale/views/waiting.py b/src/pretix/presale/views/waiting.py
index e1851c41d..173fc39d9 100644
--- a/src/pretix/presale/views/waiting.py
+++ b/src/pretix/presale/views/waiting.py
@@ -24,6 +24,7 @@ from datetime import timedelta
 from django.conf import settings
 from django.contrib import messages
 from django.db import transaction
+from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.decorators import method_decorator
 from django.utils.timezone import now
@@ -107,8 +108,11 @@ class WaitingView(EventViewMixin, FormView):
         self.subevent = None
         if request.event.has_subevents:
             if 'subevent' in request.GET:
-                self.subevent = get_object_or_404(SubEvent, event=request.event, pk=request.GET['subevent'],
-                                                  active=True)
+                try:
+                    self.subevent = get_object_or_404(SubEvent, event=request.event, pk=request.GET['subevent'],
+                                                      active=True)
+                except ValueError:
+                    raise Http404()
             else:
                 messages.error(request, pgettext_lazy('subevent', "You need to select a date."))
                 return redirect(self.get_index_url())