diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 09f99349b..80266c78d 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -31,17 +31,9 @@
                         <td class="d-flex justify-content-between align-items-start">
                             {% if object.rack %}
                                 {{ object.rack|linkify }}
-                                {% if object.parent_bay %}
-                                    {% with object.parent_bay.device as parent %}
-                                        <a href="{{ object.rack.get_absolute_url }}?device={{ parent.pk }}" class="btn btn-primary btn-sm d-print-none" title="{% trans "Highlight device in rack" %}">
-                                          <i class="mdi mdi-view-day-outline"></i>
-                                        </a>
-                                    {% endwith %}
-                                {% else %}
-                                    <a href="{{ object.rack.get_absolute_url }}?device={{ object.pk }}" class="btn btn-primary btn-sm d-print-none" title="{% trans "Highlight device in rack" %}">
-                                      <i class="mdi mdi-view-day-outline"></i>
-                                    </a>
-                                {% endif %}
+                                <a href="{{ object.rack.get_absolute_url }}?device={% firstof object.parent_bay.device.pk object.pk %}" class="btn btn-primary btn-sm d-print-none" title="{% trans "Highlight device in rack" %}">
+                                  <i class="mdi mdi-view-day-outline"></i>
+                                </a>
                             {% else %}
                                 {{ ''|placeholder }}
                             {% endif %}