diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index f1d2daa..7b2046c 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     "name": "Improved Field Service Management",
-    "version": "17.0.0.3.0",
+    "version": "17.0.0.3.1",
     "summary": (
         "Adds functionality necessary for managing field service operations at Durpro."
     ),
diff --git a/bemade_fsm/models/task_template.py b/bemade_fsm/models/task_template.py
index 6a5fd7a..4d66f4f 100644
--- a/bemade_fsm/models/task_template.py
+++ b/bemade_fsm/models/task_template.py
@@ -101,7 +101,7 @@ class TaskTemplate(models.Model):
             "equipment_ids": (
                 [Command.set(self.equipment_ids.ids)] if self.equipment_ids else False
             ),
-            "partner_id": partner_id.id,
+            "partner_id": partner_id and partner_id.id,
             "company_id": self.company_id.id,
         }
         return vals
diff --git a/bemade_fsm/tests/test_task.py b/bemade_fsm/tests/test_task.py
index 156acbe..c1c15f0 100644
--- a/bemade_fsm/tests/test_task.py
+++ b/bemade_fsm/tests/test_task.py
@@ -150,3 +150,18 @@ class TaskTest(BemadeFSMBaseTest):
                 subtask.name = "Subtask 1"
         subtask = task.child_ids[-1]
         self.assertEqual(subtask.site_contacts, task.site_contacts)
+
+    def test_subtask_inherits_parent_customer(self):
+        so = self._generate_sale_order()
+        product = self._generate_product()
+        partner = so.partner_id
+        sol = self._generate_sale_order_line(so, product)
+        so.action_confirm()
+        task = sol.task_id
+
+        self.assertEqual(task.partner_id, partner)
+        with Form(task) as form:
+            with form.child_ids.new() as child_form:
+                child_form.name = "something"
+
+        self.assertEqual(task.child_ids.partner_id, task.partner_id)