diff --git a/addons/website_sale_stock/models/product_template.py b/addons/website_sale_stock/models/product_template.py
index 0562e43ac61..eb7bc12bc99 100644
--- a/addons/website_sale_stock/models/product_template.py
+++ b/addons/website_sale_stock/models/product_template.py
@@ -27,8 +27,10 @@ class ProductTemplate(models.Model):
         if combination_info['product_id']:
             product = self.env['product.product'].sudo().browse(combination_info['product_id'])
             website = self.env['website'].get_current_website()
+            virtual_available = product.with_context(warehouse=website.warehouse_id.id).virtual_available
             combination_info.update({
-                'virtual_available': product.with_context(warehouse=website.warehouse_id.id).virtual_available,
+                'virtual_available': virtual_available,
+                'virtual_available_formatted': self.env['ir.qweb.field.float'].value_to_html(virtual_available, {'decimal_precision': 'Product Unit of Measure'}),
                 'product_type': product.type,
                 'inventory_availability': product.inventory_availability,
                 'available_threshold': product.available_threshold,
diff --git a/addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml b/addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml
index 38712f507f4..8bb6682e39e 100644
--- a/addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml
+++ b/addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml
@@ -6,12 +6,12 @@
         <t t-if="product_type == 'product' and _.contains(['always', 'threshold'], inventory_availability)">
             <t t-if="virtual_available gt 0">
                 <div t-if="inventory_availability == 'always'" t-attf-class="availability_message_#{product_template} text-success mt16">
-                    <t t-esc="virtual_available" /> <t t-esc="uom_name" /> available
+                    <t t-esc="virtual_available_formatted" /> <t t-esc="uom_name" /> available
                 </div>
                 <t t-if="inventory_availability == 'threshold'">
                     <div t-if="virtual_available lte available_threshold" t-attf-class="availability_message_#{product_template} text-warning mt16">
                         <i class="fa fa-exclamation-triangle" title="Warning" role="img" aria-label="Warning"/>
-                        <t t-esc="virtual_available" /> <t t-esc="uom_name" /> available
+                        <t t-esc="virtual_available_formatted" /> <t t-esc="uom_name" /> available
                     </div>
                     <div t-if="virtual_available gt available_threshold" t-attf-class="availability_message_#{product_template} text-success mt16">In stock</div>
                 </t>