diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index ef8ab68fe..5697aab1f 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1620,15 +1620,14 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form):
 class InterfaceListFilterForm(BootstrapMixin, forms.Form):
     model = Interface
     q = forms.CharField(required=False, label='Search')
-    site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug')
-    #site = FilterChoiceField(
-    #    queryset=Site.objects.annotate(filter_count=Count('devices')),
-    #    to_field_name='slug'
-    #)
+    site = FilterChoiceField(
+        queryset=Site.objects.annotate(filter_count=Count('member_interfaces')),
+        to_field_name='slug'
+    )
     enabled = forms.ChoiceField(choices=add_blank_choice(IFACE_ENABLED_CHOICES), required=False)
     role = FilterChoiceField(
         required=False,
-        queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
+        queryset=DeviceRole.objects.annotate(filter_count=Count('member_interfaces')),
         to_field_name='slug'
     )