diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
index 99d813ea1..bcea1f7f6 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
@@ -203,15 +203,10 @@ public class TaskSource extends BaseEntity {
             OrderElement orderElement) {
         task.setName(orderElement.getName());
         Date orderInitDate = orderElement.getOrder().getInitDate();
-        if (task.getStartDate() == null && orderInitDate != null) {
+        if (task.getIntraDayStartDate() == null && orderInitDate != null) {
             task.setStartDate(orderInitDate);
         }
-        if (task.getEndDate() == null) {
-            task.initializeDatesIfNeeded();
-        }
-        if (!hasSomeAllocationDone(task)) {
-            task.initializeDatesIfNeeded();
-        }
+        task.initializeDatesIfNeeded();
         task.updateDeadlineFromOrderElement();
     }