diff --git a/peachjam/admin.py b/peachjam/admin.py
index 3e62a247b..cfd78ca78 100644
--- a/peachjam/admin.py
+++ b/peachjam/admin.py
@@ -762,6 +762,16 @@ def get_fieldsets(self, request, obj=None):
 
         return fieldsets
 
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "registry":
+            kwargs["queryset"] = CourtRegistry.objects.select_related("court").all()
+        return super().formfield_for_foreignkey(db_field, request, **kwargs)
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        print(qs.count())
+        return qs.select_related("court", "registry__court")
+
 
 @admin.register(Predicate)
 class PredicateAdmin(admin.ModelAdmin):