diff --git a/addons/stock/models/stock_storage_category.py b/addons/stock/models/stock_storage_category.py
index abc8a6f410b..f58b21e060b 100644
--- a/addons/stock/models/stock_storage_category.py
+++ b/addons/stock/models/stock_storage_category.py
@@ -20,6 +20,7 @@ class StorageCategory(models.Model):
         ('mixed', 'Allow mixed products')], default='mixed', required=True)
     location_ids = fields.One2many('stock.location', 'storage_category_id')
     company_id = fields.Many2one('res.company', 'Company')
+    weight_uom_name = fields.Char(string='Weight unit', compute='_compute_weight_uom_name')
 
     _sql_constraints = [
         ('positive_max_weight', 'CHECK(max_weight >= 0)', 'Max weight should be a positive number.'),
@@ -31,6 +32,9 @@ class StorageCategory(models.Model):
             storage_category.product_capacity_ids = storage_category.capacity_ids.filtered(lambda c: c.product_id)
             storage_category.package_capacity_ids = storage_category.capacity_ids.filtered(lambda c: c.package_type_id)
 
+    def _compute_weight_uom_name(self):
+        self.weight_uom_name = self.env['product.template']._get_weight_uom_name_from_ir_config_parameter()
+
     def _set_storage_capacity_ids(self):
         for storage_category in self:
             storage_category.capacity_ids = storage_category.product_capacity_ids | storage_category.package_capacity_ids
diff --git a/addons/stock/views/stock_storage_category_views.xml b/addons/stock/views/stock_storage_category_views.xml
index cab8385103c..7abd91c8dc5 100644
--- a/addons/stock/views/stock_storage_category_views.xml
+++ b/addons/stock/views/stock_storage_category_views.xml
@@ -19,7 +19,7 @@
                             <label for="max_weight"/>
                             <div class="o_row">
                                 <field name="max_weight"/>
-                                <span>kg</span>
+                                <span><field name="weight_uom_name"/></span>
                             </div>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
@@ -56,7 +56,7 @@
         <field name="arch" type="xml">
             <tree string="Storage Categories" multi_edit="1">
                 <field name="name"/>
-                <field name="max_weight" string="Max Weight (kg)"/>
+                <field name="max_weight" string="Max Weight"/>
                 <field name="allow_new_product"/>
                 <field name="company_id" groups="base.group_multi_company"/>
             </tree>