diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 6cc859749..217592fb1 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -110,6 +110,31 @@
                     </table>
                 </div>
             </div>
+            {% if object.get_total_weight %}
+                <div class="card">
+                    <h5 class="card-header">
+                        Weight
+                    </h5>
+                    <div class="card-body">
+                    <table class="table table-hover attr-table">
+                        <tr>
+                            <th scope="row">Device Weight</th>
+                            <td>
+                                {% if object.device_type.weight %}
+                                    {{ object.device_type.weight|floatformat }} {{ object.device_type.get_weight_unit_display }}
+                                {% else %}
+                                    {{ ''|placeholder }}
+                                {% endif %}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Total Weight</th>
+                            <td>{{ object.get_total_weight|floatformat }} Kilograms</td>
+                        </tr>
+                    </table>
+                    </div>
+                </div>
+            {% endif %}
             {% if vc_members %}
                 <div class="card">
                     <h5 class="card-header">
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index acd72a5d1..887f7b734 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -198,7 +198,7 @@
                         <th scope="row">Rack Weight</th>
                         <td>
                             {% if object.weight %}
-                                {{ object.weight }}
+                                {{ object.weight|floatformat }} {{ object.get_weight_unit_display }}
                             {% else %}
                                 {{ ''|placeholder }}
                             {% endif %}
@@ -206,7 +206,7 @@
                     </tr>
                     <tr>
                         <th scope="row">Total Weight</th>
-                        <td>{{ object.get_total_weight }} kg</td>
+                        <td>{{ object.get_total_weight|floatformat }} Kilograms</td>
                     </tr>
                 </table>
                 </div>