diff --git a/AKModel/views/ak.py b/AKModel/views/ak.py
index 88fc6bf4c767ac32cbeb6aee37d3d009c0b9538b..0539898e4169546d3f6c18b8d28f5976e23431ec 100644
--- a/AKModel/views/ak.py
+++ b/AKModel/views/ak.py
@@ -89,7 +89,7 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
                                             slots_in_an_hour=SLOTS_IN_AN_HOUR)
                 constraints = []
 
-                if slot.end < self.event.reso_deadline:
+                if self.event.reso_deadline is None or slot.end < self.event.reso_deadline:
                     constraints.append("resolution")
 
                 for (ak, availability) in ak_availabilities.items():