diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py
index cead980cd4..10f6965603 100644
--- a/src/pretix/control/views/organizer.py
+++ b/src/pretix/control/views/organizer.py
@@ -2214,7 +2214,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi
 
     def get_queryset(self):
         q = Q(customer=self.customer)
-        if self.request.organizer.settings.customer_accounts_link_by_email:
+        if self.request.organizer.settings.customer_accounts_link_by_email and self.customer.email:
             # This is safe because we only let customers with verified emails log in
             q |= Q(email__iexact=self.customer.email)
         qs = Order.objects.filter(
diff --git a/src/pretix/presale/views/customer.py b/src/pretix/presale/views/customer.py
index e99e0f0f05..7a8cf39dde 100644
--- a/src/pretix/presale/views/customer.py
+++ b/src/pretix/presale/views/customer.py
@@ -350,7 +350,7 @@ class ProfileView(CustomerRequiredMixin, ListView):
 
     def get_queryset(self):
         q = Q(customer=self.request.customer)
-        if self.request.organizer.settings.customer_accounts_link_by_email:
+        if self.request.organizer.settings.customer_accounts_link_by_email and self.request.customer.email:
             # This is safe because we only let customers with verified emails log in
             q |= Q(email__iexact=self.request.customer.email)
         qs = Order.objects.filter(