diff --git a/website_sale_aplicoop/models/group_order.py b/website_sale_aplicoop/models/group_order.py
index 0fdcd52..c873c13 100644
--- a/website_sale_aplicoop/models/group_order.py
+++ b/website_sale_aplicoop/models/group_order.py
@@ -134,7 +134,8 @@ class GroupOrder(models.Model):
 
     # === Home delivery ===
     home_delivery = fields.Boolean(
-        default=False,
+        compute="_compute_home_delivery",
+        store=True,
         tracking=True,
         help="Whether this consumer group order includes home delivery service",
     )
@@ -255,6 +256,11 @@ 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 140a98d..1a26046 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" 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"/>
+                                <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."/>
                             </group>
                         </group>
                         <group string="Calculated Dates" name="calculated_dates">