diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
index 8331357f3..c0df20bc8 100644
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -5,28 +5,28 @@
         Non-Racked Devices
     </h5>
       <div class="card-body htmx-container table-responsive"
-        hx-get="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null&parent_bay_id=null"
+        hx-get="{% url 'dcim:device_list' %}?site_id={{ site_id }}&rack_id=null&parent_bay_id=null"
         hx-trigger="load"
       ></div>
 
     {% if perms.dcim.add_device %}
         {% if object|meta:'verbose_name' == 'rack' %}
         <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&rack={{ object.pk }}" class="btn btn-primary btn-sm">
+            <a href="{% url 'dcim:device_add' %}?site={{ site_id }}&rack={{ object.pk }}" class="btn btn-primary btn-sm">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
                 Add a Non-Racked Device
             </a>
         </div>
         {% elif object|meta:'verbose_name' == 'site' %}
         <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:device_add' %}?site={{ object.pk }}" class="btn btn-primary btn-sm">
+            <a href="{% url 'dcim:device_add' %}?site={{ site_id }}" class="btn btn-primary btn-sm">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
                 Add a Non-Racked Device
             </a>
         </div>
         {% elif object|meta:'verbose_name' == 'location' %}
         <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&location={{ object.pk }}" class="btn btn-primary btn-sm">
+            <a href="{% url 'dcim:device_add' %}?site={{ site_id }}&location={{ object.pk }}" class="btn btn-primary btn-sm">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
                 Add a Non-Racked Device
             </a>
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index b6cae1d2a..955a6b140 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -72,7 +72,7 @@
 </div>
 <div class="row mb-3">
 	<div class="col col-md-12">
-    {% include 'dcim/inc/nonracked_devices.html' %}
+    {% include 'dcim/inc/nonracked_devices.html' with site_id=object.site.pk %}
     <div class="card">
       <h5 class="card-header">Child Locations</h5>
       <div class="card-body htmx-container table-responsive"
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 9f57d3638..79df56343 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -196,7 +196,7 @@
   </div>
   <div class="row">
       <div class="col col-md-12">
-          {% include 'dcim/inc/nonracked_devices.html' %}
+          {% include 'dcim/inc/nonracked_devices.html' with site_id=object.site.pk %}
           {% plugin_full_width_page object %}
       </div>
   </div>
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 4e5d627c7..c2df55091 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -152,7 +152,7 @@
         </div>
       {% endif %}
     </div>
-    {% include 'dcim/inc/nonracked_devices.html' %}
+    {% include 'dcim/inc/nonracked_devices.html' with site_id=object.pk %}
     {% plugin_full_width_page object %}
   </div>
 </div>