diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java
index 85679aee6..6e74d1f86 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java
@@ -108,7 +108,7 @@ public class TaskEditFormComposer extends GenericForwardComposer {
 
         result.name = task.getName();
         result.beginDate = asDate(task.getBeginDate().toLocalDate());
-        result.endDate = asDate(task.getEndDate().asExclusiveEnd());
+        result.endDate = asDate(task.getEndDate().toLocalDate());
         result.notes = task.getNotes();
         result.deadlineDate = task.getDeadline();
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java
index b8115893e..01ce78435 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java
@@ -364,8 +364,7 @@ public class FormBinder {
         private void initializeDateAndDurationFieldsFromTaskOriginalValues() {
             Task task = getTask();
             showValueOfDateOn(labelTaskStart, task.getStartAsLocalDate());
-            showValueOfDateOn(labelTaskEnd, task.getIntraDayEndDate()
-                    .asExclusiveEnd());
+            showValueOfDateOn(labelTaskEnd, task.getEndAsLocalDate());
 
             taskWorkableDays.setConstraint(positiveValueRequired());
             taskWorkableDays.setValue(task.getWorkableDays());