diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 6b73a061bc..1485476219 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -609,7 +609,9 @@ def get_children(self, request, parent):
         return parent.get_child_ips().restrict(request.user, 'view').prefetch_related('vrf', 'tenant', 'tenant__group')
 
     def prep_table_data(self, request, queryset, parent):
-        if not request.GET.get('q') and not request.GET.get('sort'):
+        if not request.GET.get('q') and not request.GET.get('sort') and not (
+                request.user.is_authenticated and request.user.config.get(f'tables.IPAddressTable.ordering')
+        ):
             return add_available_ipaddresses(parent.prefix, queryset, parent.is_pool)
         return queryset