diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 6bf722849..471eab9cd 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -622,14 +622,14 @@ class InterfaceListFilter(django_filters.FilterSet):
 
     def filter_site(self, queryset, name, value):
         try:
-            site = Site.objects.select_related('device_id').get(**{name: value})
+            site = Device.objects.select_related('device_id','site').get(**{name: value})
             return queryset
         except Device.DoesNotExist:
             return queryset.none()
     
     def filter_role(self, queryset, name, value):
         try:
-            site = DeviceRole.objects.select_related('device_id').get(**{name: value})
+            site = Device.objects.select_related('device_id','device_role').get(**{name: value})
             return queryset
         except Device.DoesNotExist:
             return queryset.none()