diff --git a/website_sale_aplicoop/models/group_order.py b/website_sale_aplicoop/models/group_order.py
index c873c13..0fdcd52 100644
--- a/website_sale_aplicoop/models/group_order.py
+++ b/website_sale_aplicoop/models/group_order.py
@@ -134,8 +134,7 @@ class GroupOrder(models.Model):
 
     # === Home delivery ===
     home_delivery = fields.Boolean(
-        compute="_compute_home_delivery",
-        store=True,
+        default=False,
         tracking=True,
         help="Whether this consumer group order includes home delivery service",
     )
@@ -256,11 +255,6 @@ class GroupOrder(models.Model):
             else:
                 record.display_image = False
 
-    @api.depends("delivery_product_id")
-    def _compute_home_delivery(self):
-        for record in self:
-            record.home_delivery = bool(record.delivery_product_id)
-
     available_products_count = fields.Integer(
         compute="_compute_available_products_count",
         store=False,
diff --git a/website_sale_aplicoop/views/group_order_views.xml b/website_sale_aplicoop/views/group_order_views.xml
index 1a26046..140a98d 100644
--- a/website_sale_aplicoop/views/group_order_views.xml
+++ b/website_sale_aplicoop/views/group_order_views.xml
@@ -61,8 +61,8 @@
                                 <field name="period" help="How often this order repeats"/>
                                 <field name="pickup_day" help="Day when members pick up orders"/>
                                 <field name="cutoff_day" help="Day when purchases stop"/>
-                                <field name="home_delivery" readonly="1" help="Automatically enabled when a delivery product is configured"/>
-                                <field name="delivery_product_id" help="Product to use for home delivery. Setting this enables home delivery."/>
+                                <field name="home_delivery" help="Enable home delivery option for this order"/>
+                                <field name="delivery_product_id" invisible="not home_delivery" required="home_delivery" help="Product to use for home delivery"/>
                             </group>
                         </group>
                         <group string="Calculated Dates" name="calculated_dates">
diff --git a/website_sale_aplicoop/views/website_templates.xml b/website_sale_aplicoop/views/website_templates.xml
index f34a93a..3a465c6 100644
--- a/website_sale_aplicoop/views/website_templates.xml
+++ b/website_sale_aplicoop/views/website_templates.xml
@@ -129,10 +129,14 @@
                             <span class="meta-value">
                                 <t t-foreach="order.pickup_slot_ids" t-as="slot">
                                     <div class="slot-entry">
-                                        <t t-esc="day_names[int(slot.weekday) % 7]" />
-                                        &#160;
-                                        <t t-esc="('%02d:%02d–%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
-                                        <t t-if="slot.label">&#160;(<t t-esc="slot.label" />)</t>
+                                        <t t-if="slot.label">
+                                            <t t-esc="slot.label" />
+                                        </t>
+                                        <t t-else="">
+                                            <t t-esc="day_names[int(slot.weekday) % 7]" />
+                                            &#160;
+                                            <t t-esc="('%02d:%02d-%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
+                                        </t>
                                     </div>
                                 </t>
                             </span>
@@ -212,10 +216,14 @@
                                                 <span class="info-value">
                                                     <t t-foreach="group_order.pickup_slot_ids" t-as="slot">
                                                         <div>
-                                                            <t t-esc="day_names[int(slot.weekday) % 7]" />
-                                                            &#160;
-                                                            <t t-esc="('%02d:%02d–%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
-                                                            <t t-if="slot.label">&#160;(<t t-esc="slot.label" />)</t>
+                                                            <t t-if="slot.label">
+                                                                <t t-esc="slot.label" />
+                                                            </t>
+                                                            <t t-else="">
+                                                                <t t-esc="day_names[int(slot.weekday) % 7]" />
+                                                                &#160;
+                                                                <t t-esc="('%02d:%02d-%02d:%02d' % (int(slot.start_hour or 0), int(((slot.start_hour or 0) % 1) * 60), int(slot.end_hour or 0), int(((slot.end_hour or 0) % 1) * 60)))" />
+                                                            </t>
                                                         </div>
                                                     </t>
                                                 </span>