diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
index 8960e374f..b19af9561 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
@@ -395,6 +395,13 @@ public abstract class OrderElement extends IntegrationEntity implements
         removeChildrenTaskSource(result);
         if (getOnDBTaskSource() != null) {
             result.add(taskSourceRemoval());
+        } else {
+            TaskSource taskSource = getTaskSource();
+            if (taskSource != null) {
+                taskSource.getTask().detachFromDependencies();
+                taskSource.getTask().detachFromParent();
+                getCurrentSchedulingData().taskSourceRemovalRequested();
+            }
         }
     }