diff --git a/netbox/dcim/admin.py b/netbox/dcim/admin.py
index 775f046cd..09e16c348 100644
--- a/netbox/dcim/admin.py
+++ b/netbox/dcim/admin.py
@@ -180,4 +180,4 @@ class DeviceAdmin(admin.ModelAdmin):
 
     def get_queryset(self, request):
         qs = super(DeviceAdmin, self).get_queryset(request)
-        return qs.select_related('device_type__manufacturer', 'device_role', 'primary_ip', 'rack')
+        return qs.select_related('device_type__manufacturer', 'device_role', 'primary_ip4', 'primary_ip6', 'rack')