diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
index ffeb9dc8c..b8bd6e132 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
@@ -198,7 +198,7 @@
             </type>
         </property>
         <many-to-one name="orderElement" column="ORDER_ELEMENT_ID"></many-to-one>
-        <one-to-one name="taskSource" class="TaskSource" access="field" property-ref="schedulingData" />
+        <one-to-one name="taskSource" class="TaskSource" cascade="all" access="field" property-ref="schedulingData" />
     </class>
 
     <class name="TaskSource">
@@ -211,7 +211,7 @@
         <many-to-one name="schedulingData" class="SchedulingDataForVersion"
             cascade="none" unique="true" access="field" />
         <one-to-one name="task" class="org.navalplanner.business.planner.entities.TaskElement"
-            constrained="true" cascade="all" access="field" lazy="false"/>
+            constrained="true" cascade="delete" access="field" lazy="false"/>
 
         <set name="hoursGroups" table="task_source_hours_groups" cascade="none" inverse="false" access="field">
             <key column="TASK_SOURCE_ID"></key>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
index 89f8ae198..836b32bea 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
@@ -20,7 +20,7 @@
         <many-to-one name="parent" class="TaskGroup" cascade="none" column="parent"
             index="idx_TaskElement_on_TaskGroup" />
 
-        <one-to-one name="taskSource" cascade="none"/>
+        <one-to-one name="taskSource" cascade="delete"/>
 
         <!-- Indexed on the other side -->
         <set name="dependenciesWithThisOrigin" cascade="all-delete-orphan">