diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 51d28c006..e8f3e4d77 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -520,7 +520,7 @@ def device(request, pk):
         .select_related('connected_as_a', 'connected_as_b', 'circuit')
     mgmt_interfaces = Interface.objects.filter(device=device, mgmt_only=True)\
         .select_related('connected_as_a', 'connected_as_b', 'circuit')
-    device_bays = DeviceBay.objects.filter(device=device).select_related('installed_device')
+    device_bays = DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer')
 
     # Gather any secrets which belong to this device
     secrets = device.secrets.all()
diff --git a/netbox/templates/dcim/inc/_devicebay.html b/netbox/templates/dcim/inc/_devicebay.html
index e4fff1641..b9fbf1395 100644
--- a/netbox/templates/dcim/inc/_devicebay.html
+++ b/netbox/templates/dcim/inc/_devicebay.html
@@ -2,13 +2,18 @@
     <td>
         <i class="fa fa-fw fa-{% if devicebay.installed_device %}dot-circle-o{% else %}circle-o{% endif %}"></i> {{ devicebay.name }}
     </td>
-    <td>
-        {% if devicebay.installed_device %}
+    {% if devicebay.installed_device %}
+        <td>
             <a href="{% url 'dcim:device' pk=devicebay.installed_device.pk %}">{{ devicebay.installed_device }}</a>
-        {% else %}
+        </td>
+        <td>
+            <span>{{ devicebay.installed_device.device_type }}</span>
+        </td>
+    {% else %}
+        <td colspan="2">
             <span class="text-muted">Vacant</span>
-        {% endif %}
-    </td>
+        </td>
+    {% endif %}
     <td class="text-right">
         {% if perms.dcim.change_devicebay %}
             {% if devicebay.installed_device %}