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 438809758..ad13498fa 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
@@ -530,7 +530,6 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         calculateAndSetTotalHours();
         orderDAO.save(order);
         reattachCurrentTaskSources();
-        deleteOrderElementWithoutParent();
         if (newOrderVersionNeeded) {
             OrderVersion newVersion = OrderVersion
                     .createInitialVersion(currentScenario);
@@ -549,6 +548,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         }
         saveDerivedScenarios();
         calculateAdvancePercentageIncludingChildren(order);
+        deleteOrderElementWithoutParent();
     }
 
     private void calculateAdvancePercentageIncludingChildren(OrderElement order) {