diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
index f6b648070..4be901ef4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
@@ -123,4 +123,6 @@ public interface IOrderModel {
 
     boolean isAlreadyInUseAndIsOnlyInCurrentScenario(Order order);
 
+    void useSchedulingDataForCurrentScenario(Order order);
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 26ba1e5ca..09592f704 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -628,6 +628,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     public void schedule(Order order) {
+        orderModel.useSchedulingDataForCurrentScenario(order);
         if(orderModel.userCanRead(order, SecurityUtils.getSessionUserLoginName())) {
             if (order.isScheduled()) {
                 planningControllerEntryPoints.goToScheduleOf(order);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index d5483baf2..c7447b2be 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -918,4 +918,11 @@ public class OrderModel implements IOrderModel {
         return isAlreadyInUse(order) && (order.getScenarios().size() == 1);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public void useSchedulingDataForCurrentScenario(Order order) {
+        orderDAO.reattach(order);
+        order.useSchedulingDataFor(scenarioManager.getCurrent());
+    }
+
 }