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 ef7138b65..76456815d 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
@@ -592,6 +592,13 @@ public class TaskElementAdapter {
 
             private GanttDate getAdvanceEndDate(BigDecimal advancePercentage) {
                 BigDecimal hours = BigDecimal.ZERO;
+
+                if (taskElement instanceof TaskGroup) {
+                    //progess calculation for TaskGroups is done with
+                    //this method, which is much lighter
+                    return calculateLimitDateByPercentage(advancePercentage);
+                }
+
                 if (taskElement.getOrderElement() != null) {
                     if(taskElement.getParent() == null){
                         //it's an order, we use the cached value
@@ -604,10 +611,6 @@ public class TaskElementAdapter {
                     }
                 }
 
-                if (taskElement instanceof TaskGroup) {
-                    return calculateLimitDateByPercentage(advancePercentage);
-                }
-
                 // Calculate date according to advanceHours or advancePercentage
                 final Integer advanceHours = advancePercentage.multiply(
                         hours).intValue();