diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index f9dee5dec..870a11890 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -9,6 +9,7 @@
 ### Bug Fixes
 
 * [#5584](https://github.com/netbox-community/netbox/issues/5584) - Restore power utilization panel under device view
+* [#5597](https://github.com/netbox-community/netbox/issues/5597) - Fix ordering devices by primary IP address
 
 ---
 
diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 2b067a69d..edd9e7a43 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -129,6 +129,7 @@ class DeviceTable(BaseTable):
     )
     primary_ip = tables.Column(
         linkify=True,
+        order_by=('primary_ip6', 'primary_ip4'),
         verbose_name='IP Address'
     )
     primary_ip4 = tables.Column(