diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java
index 0cb2fbe7a..25084ad33 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java
@@ -110,8 +110,11 @@ public class DashboardTabCreator {
 
             @Override
             protected void afterShowAction() {
-                List<TaskElement> criticalPath = getCriticalPath(mode.getOrder(),
-                        getDesktop());
+                List<TaskElement> criticalPath = orderPlanningController.getCriticalPath();
+                if (criticalPath == null) {
+                    criticalPath = getCriticalPath(mode.getOrder(),
+                            getDesktop());
+                }
                 PlanningState planningState = getPlanningState(mode.getOrder(), getDesktop());
                 Order currentOrder = planningState.getOrder();
                 dashboardController.setCurrentOrder(planningState,