diff --git a/base_requirements.txt b/base_requirements.txt
index c2d533af8..673006aa4 100644
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -57,8 +57,7 @@ django-storages
 
 # Abstraction models for rendering and paginating HTML tables
 # https://github.com/jieter/django-tables2/blob/master/CHANGELOG.md
-# See #21902 for upgrading to django-tables2 v2.9+
-django-tables2<2.9
+django-tables2
 
 # User-defined tags for objects
 # https://github.com/jazzband/django-taggit/blob/master/CHANGELOG.rst
diff --git a/netbox/templates/inc/table.html b/netbox/templates/inc/table.html
index 0cfa7c2b2..90de745b5 100644
--- a/netbox/templates/inc/table.html
+++ b/netbox/templates/inc/table.html
@@ -6,7 +6,7 @@
       <tr>
         {% for column in table.columns %}
           {% if column.orderable %}
-            <th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
+            <th {{ column.attrs.th.as_html }}><a href="{% querystring_replace table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
           {% else %}
             <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
           {% endif %}
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html
index 0165b1d29..bcb929656 100644
--- a/netbox/templates/inc/table_htmx.html
+++ b/netbox/templates/inc/table_htmx.html
@@ -13,14 +13,14 @@
               {% if column.is_ordered %}
                 <div class="float-end">
                   <a href="#"
-                     hx-get="{{ table.htmx_url }}{% querystring table.prefixed_order_by_field='' %}"
+                     hx-get="{{ table.htmx_url }}{% querystring_replace table.prefixed_order_by_field='' %}"
                      class="text-danger"
                      title="{% trans "Clear ordering" %}"
                   ><i class="mdi mdi-close"></i></a>
                 </div>
               {% endif %}
               <a href="#"
-                 hx-get="{{ table.htmx_url }}{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
+                 hx-get="{{ table.htmx_url }}{% querystring_replace table.prefixed_order_by_field=column.order_by_alias.next %}"
               >{{ column.header }}</a>
             </th>
           {% else %}
diff --git a/requirements.txt b/requirements.txt
index 8a638af25..4b4c0dbb8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ django-redis==6.0.0
 django-rich==2.2.0
 django-rq==4.1.0
 django-storages==1.14.6
-django-tables2==2.8.0
+django-tables2==3.0.0
 django-taggit==6.1.0
 django-timezone-field==7.2.1
 djangorestframework==3.17.1