diff --git a/CHANGELOG.md b/CHANGELOG.md
index 323526e5a..d9433aacf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ v2.4.9 (FUTURE)
 * [#2613](https://github.com/digitalocean/netbox/issues/2613) - Decrease live search minimum characters to three
 * [#2615](https://github.com/digitalocean/netbox/issues/2615) - Tweak live search widget to use brief format for API requests
 * [#2623](https://github.com/digitalocean/netbox/issues/2623) - Removed the need to pass the model class to the rqworker process for webhooks
+* [#2634](https://github.com/digitalocean/netbox/issues/2634) - Enforce consistent representation of unnamed devices in rack view
 
 ---
 
diff --git a/netbox/templates/dcim/inc/rack_elevation.html b/netbox/templates/dcim/inc/rack_elevation.html
index 46fe01c8d..e7beeb9ba 100644
--- a/netbox/templates/dcim/inc/rack_elevation.html
+++ b/netbox/templates/dcim/inc/rack_elevation.html
@@ -27,13 +27,13 @@
                     {% ifequal u.device.face face_id %}
                         <a href="{% url 'dcim:device' pk=u.device.pk %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true"
                            data-content="{{ u.device.device_role }}<br />{{ u.device.device_type.full_name }} ({{ u.device.device_type.u_height }}U){% if u.device.asset_tag %}<br />{{ u.device.asset_tag }}{% endif %}{% if u.device.serial %}<br />{{ u.device.serial }}{% endif %}">
-                            {{ u.device.name|default:u.device.device_role }}
+                            {{ u.device }}
                             {% if u.device.devicebay_count %}
                                 ({{ u.device.get_children.count }}/{{ u.device.devicebay_count }})
                             {% endif %}
                         </a>
                     {% else %}
-                        <span>{{ u.device.name|default:u.device.device_role }}</span>
+                        <span>{{ u.device }}</span>
                     {% endifequal %}
                 </li>
             {% else %}