diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 20cf08535..558b9704b 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -445,16 +445,8 @@ class LocationView(generic.ObjectView):
             (Device.objects.restrict(request.user, 'view').filter(location__in=locations), 'location_id'),
         )
 
-        nonracked_devices = Device.objects.filter(
-            location=instance,
-            rack__isnull=True,
-            parent_bay__isnull=True
-        ).prefetch_related('device_type__manufacturer', 'parent_bay', 'device_role')
-
         return {
             'related_models': related_models,
-            'nonracked_devices': nonracked_devices.order_by('-pk')[:10],
-            'total_nonracked_devices_count': nonracked_devices.count(),
         }
 
 
@@ -636,13 +628,6 @@ class RackView(generic.ObjectView):
             (PowerFeed.objects.restrict(request.user).filter(rack=instance), 'rack_id'),
         )
 
-        # Get 0U devices located within the rack
-        nonracked_devices = Device.objects.filter(
-            rack=instance,
-            position__isnull=True,
-            parent_bay__isnull=True
-        ).prefetch_related('device_type__manufacturer', 'parent_bay', 'device_role')
-
         peer_racks = Rack.objects.restrict(request.user, 'view').filter(site=instance.site)
 
         if instance.location:
@@ -659,7 +644,6 @@ class RackView(generic.ObjectView):
 
         return {
             'related_models': related_models,
-            'nonracked_devices': nonracked_devices,
             'next_rack': next_rack,
             'prev_rack': prev_rack,
             'svg_extra': svg_extra,
diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
deleted file mode 100644
index c0df20bc8..000000000
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load helpers %}
-
-<div class="card">
-    <h5 class="card-header">
-        Non-Racked Devices
-    </h5>
-      <div class="card-body htmx-container table-responsive"
-        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={{ 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={{ 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={{ 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>
-        </div>
-        {% endif %}
-    {% endif %}
-</div>
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 955a6b140..743622ee6 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -72,7 +72,24 @@
 </div>
 <div class="row mb-3">
 	<div class="col col-md-12">
-    {% include 'dcim/inc/nonracked_devices.html' with site_id=object.site.pk %}
+    <div class="card">
+        <h5 class="card-header">
+            Non-Racked Devices
+        </h5>
+          <div class="card-body htmx-container table-responsive"
+            hx-get="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null&parent_bay_id=null"
+            hx-trigger="load"
+          ></div>
+
+        {% if perms.dcim.add_device %}
+            <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">
+                    <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
+                    Add a Non-Racked Device
+                </a>
+            </div>
+        {% endif %}
+    </div>
     <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 79df56343..083bf77dc 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -196,8 +196,25 @@
   </div>
   <div class="row">
       <div class="col col-md-12">
-          {% include 'dcim/inc/nonracked_devices.html' with site_id=object.site.pk %}
-          {% plugin_full_width_page object %}
+        <div class="card">
+            <h5 class="card-header">
+                Non-Racked Devices
+            </h5>
+              <div class="card-body htmx-container table-responsive"
+                hx-get="{% url 'dcim:device_list' %}?rack_id={{ object.pk }}&position=null&parent_bay_id=null"
+                hx-trigger="load"
+              ></div>
+
+            {% if perms.dcim.add_device %}
+                <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">
+                        <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
+                        Add a Non-Racked Device
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% plugin_full_width_page object %}
       </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index c2df55091..0cb5ce826 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -152,7 +152,24 @@
         </div>
       {% endif %}
     </div>
-    {% include 'dcim/inc/nonracked_devices.html' with site_id=object.pk %}
+    <div class="card">
+        <h5 class="card-header">
+            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-trigger="load"
+          ></div>
+
+        {% if perms.dcim.add_device %}
+            <div class="card-footer text-end noprint">
+                <a href="{% url 'dcim:device_add' %}?site={{ 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>
+        {% endif %}
+    </div>
     {% plugin_full_width_page object %}
   </div>
 </div>