diff --git a/docs/release-notes/version-2.8.md b/docs/release-notes/version-2.8.md
index 5d8687588..cb611f25f 100644
--- a/docs/release-notes/version-2.8.md
+++ b/docs/release-notes/version-2.8.md
@@ -1,5 +1,13 @@
 # NetBox v2.8
 
+v2.8.5 (FUTURE)
+
+### Bug Fixes
+
+* [#3304](https://github.com/netbox-community/netbox/issues/3304) - Fix caching invalidation issue related to device/virtual machine primary IP addresses
+
+---
+
 v2.8.4 (2020-05-13)
 
 ### Enhancements
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index cd1b4edf4..d141f93c6 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1105,7 +1105,7 @@ class DeviceView(PermissionRequiredMixin, View):
     def get(self, request, pk):
 
         device = get_object_or_404(Device.objects.prefetch_related(
-            'site__region', 'rack__group', 'tenant__group', 'device_role', 'platform'
+            'site__region', 'rack__group', 'tenant__group', 'device_role', 'platform', 'primary_ip4', 'primary_ip6'
         ), pk=pk)
 
         # VirtualChassis members