diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 128a129ae2a..c0a3f8f2f7f 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -291,7 +291,7 @@ class ProductTemplate(models.Model):
     @api.model
     def _get_length_uom_id_from_ir_config_parameter(self):
         """ Get the unit of measure to interpret the `length`, 'width', 'height' field.
-        By default, we considerer that length are expressed in meters. Users can configure
+        By default, we considerer that length are expressed in millimeters. Users can configure
         to express them in feet by adding an ir.config_parameter record with "product.volume_in_cubic_feet"
         as key and "1" as value.
         """
@@ -299,7 +299,7 @@ class ProductTemplate(models.Model):
         if product_length_in_feet_param == '1':
             return self.env.ref('uom.product_uom_foot')
         else:
-            return self.env.ref('uom.product_uom_meter')
+            return self.env.ref('uom.product_uom_millimeter')
 
     @api.model
     def _get_volume_uom_id_from_ir_config_parameter(self):
diff --git a/addons/uom/data/uom_data.xml b/addons/uom/data/uom_data.xml
index 1129dfd3179..4c5cd00bd87 100644
--- a/addons/uom/data/uom_data.xml
+++ b/addons/uom/data/uom_data.xml
@@ -55,6 +55,12 @@
         <field name="factor" eval="1.0"/>
         <field name="uom_type">reference</field>
     </record>
+    <record id="product_uom_millimeter" model="uom.uom">
+        <field name="category_id" ref="uom_categ_length"/>
+        <field name="name">mm</field>
+        <field name="factor" eval="1000"/>
+        <field name="uom_type">smaller</field>
+    </record>
     <record id="product_uom_km" model="uom.uom">
         <field name="category_id" ref="uom_categ_length"/>
         <field name="name">km</field>