diff --git a/src/pretix/base/services/export.py b/src/pretix/base/services/export.py
index 30722fd636..ee076cd8d5 100644
--- a/src/pretix/base/services/export.py
+++ b/src/pretix/base/services/export.py
@@ -63,7 +63,7 @@ class ExportEmptyError(ExportError):
     pass
 
 
-@app.task(base=ProfiledEventTask, throws=(ExportError,), bind=True)
+@app.task(base=ProfiledEventTask, throws=(ExportError, ExportEmptyError), bind=True)
 def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str, Any]) -> None:
     def set_progress(val):
         if not self.request.called_directly:
@@ -94,7 +94,7 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
     return str(file.pk)
 
 
-@app.task(base=ProfiledOrganizerUserTask, throws=(ExportError,), bind=True)
+@app.task(base=ProfiledOrganizerUserTask, throws=(ExportError, ExportEmptyError), bind=True)
 def multiexport(self, organizer: Organizer, user: User, device: int, token: int, fileid: str, provider: str,
                 form_data: Dict[str, Any], staff_session=False) -> None:
     if device:
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index b3318907df..cb7b8ddb81 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -2503,7 +2503,7 @@ class ExportMixin:
 
 class ExportDoView(EventPermissionRequiredMixin, ExportMixin, AsyncAction, TemplateView):
     permission = 'can_view_orders'
-    known_errortypes = ['ExportError']
+    known_errortypes = ['ExportError', 'ExportEmptyError']
     task = export
     template_name = 'pretixcontrol/orders/export_form.html'
 
diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py
index 7ee590c02f..233e8fdc92 100644
--- a/src/pretix/control/views/organizer.py
+++ b/src/pretix/control/views/organizer.py
@@ -1726,7 +1726,7 @@ class ExportMixin:
 
 
 class ExportDoView(OrganizerPermissionRequiredMixin, ExportMixin, AsyncAction, TemplateView):
-    known_errortypes = ['ExportError']
+    known_errortypes = ['ExportError', 'ExportEmptyError']
     task = multiexport
     template_name = 'pretixcontrol/organizers/export_form.html'