diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py
index 78c3a93b78..3dda45050a 100644
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -2264,7 +2264,7 @@ class DeviceFilterForm(FilterForm):
     state = forms.ChoiceField(
         label=_('Device status'),
         choices=[
-            ('', _('All devices')),
+            ('all', _('All devices')),
             ('active', _('Active devices')),
             ('revoked', _('Revoked devices'))
         ],
diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py
index 04cae14629..e202338b5c 100644
--- a/src/pretix/control/views/organizer.py
+++ b/src/pretix/control/views/organizer.py
@@ -859,12 +859,19 @@ class DeviceQueryMixin:
     @cached_property
     def request_data(self):
         if self.request.method == "POST":
-            return self.request.POST
-        return self.request.GET
+            d = self.request.POST
+        else:
+            d = self.request.GET
+        d = d.copy()
+        d.setdefault('state', 'active')
+        return d
 
     @cached_property
     def filter_form(self):
-        return DeviceFilterForm(data=self.request_data, request=self.request)
+        return DeviceFilterForm(
+            data=self.request_data,
+            request=self.request,
+        )
 
     def get_queryset(self):
         qs = self.request.organizer.devices.prefetch_related(