diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
index aa86d4430..12de13c8c 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
@@ -396,6 +396,11 @@ public abstract class TaskElement extends BaseEntity {
 
     public void setDeadline(LocalDate deadline) {
         this.deadline = deadline;
+        if (taskSource != null && taskSource.getOrderElement() != null) {
+            Date newDeadline = this.taskSource.getOrderElement().getDeadline();
+            taskSource.getOrderElement().setDeadline(
+                    (newDeadline == null)? null : deadline.toDateMidnight().toDate());
+        }
     }
 
     void add(Dependency dependency) {