diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
index 903d961ba..10e57bff5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
@@ -568,6 +568,9 @@ public class TaskElementAdapter {
                     BigDecimal percentage = new BigDecimal(assignedEffort
                             .divivedBy(effort).doubleValue()).setScale(2,
                             RoundingMode.HALF_UP);
+                    if (percentage.compareTo(BigDecimal.ONE) == 0) {
+                        return getEndDate();
+                    }
 
                     result = calculateLimitDateByPercentage(percentage);
 
@@ -637,6 +640,10 @@ public class TaskElementAdapter {
             }
 
             private GanttDate getAdvanceEndDate(BigDecimal advancePercentage) {
+                if (advancePercentage.compareTo(BigDecimal.ONE) == 0) {
+                    return getEndDate();
+                }
+
                 BigDecimal hours = BigDecimal.ZERO;
 
                 if (taskElement instanceof TaskGroup) {