diff --git a/modules/production_work/work.py b/modules/production_work/work.py
index 6203cd2c22..5a80c52311 100644
--- a/modules/production_work/work.py
+++ b/modules/production_work/work.py
@@ -406,7 +406,7 @@ class WorkCycle(Workflow, ModelSQL, ModelView):
 
     def set_duration(self, now):
         if self.duration is None:
-            self.duration = now - self.write_date
+            self.duration = now - (self.write_date or self.create_date)
 
     def set_cost(self):
         if self.cost is None: