diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
index 1d7e1cdb8..c0499d69b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
@@ -86,7 +86,12 @@ public class SubcontractModel implements ISubcontractModel {
 
         if (subcontractedTaskData == null) {
             this.subcontractedTaskData = SubcontractedTaskData.create(task);
-            this.addDeliverDate(getEndDate());
+            if (task.getDeadline() != null) {
+                this.addDeliverDate(task.getDeadline().toDateMidnight()
+                        .toDate());
+            } else {
+                this.addDeliverDate(getEndDate());
+            }
         } else {
             subcontractedTaskDataDAO.reattach(subcontractedTaskData);
             loadRequiredDeliveringDates(subcontractedTaskData);