diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 867c70c8b..fb11e9a5c 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -324,11 +324,8 @@
                         <th scope="row">{% trans "Weight" %}</th>
                         <td>
                             {% if object.total_weight %}
-                                {% if object.device_type.weight_unit == "lb" %}
-                                    {{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %}
-                                {% elif object.device_type.weight_unit == "kg" %}
-                                    {{ object.total_weight|floatformat }} {% trans "Kilograms" %}
-                                {% endif %}
+                                {{ object.total_weight|floatformat }} {% trans "Kilograms" %}
+                                ({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %})
                             {% else %}
                                 {{ ''|placeholder }}
                             {% endif %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index ad035dd6b..eec4d63a5 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -103,8 +103,12 @@
           <tr>
             <th scope="row">{% trans "Total Weight" %}</th>
             <td>
-              {{ object.total_weight|floatformat }} {% trans "Kilograms" %}
-              ({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %})
+                {% if object.total_weight %}
+                    {{ object.total_weight|floatformat }} {% trans "Kilograms" %}
+                    ({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %})
+                {% else %}
+                    {{ ''|placeholder }}
+                {% endif %}
             </td>
           </tr>
         </table>